# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2015-01-06 00:54:36
# Node ID 9d7f9914fa8c6c9ace1ec127f82f5eb1806690c7
# Parent  9cf229b46e499334aaaacf022f65b5e815d38374

json: always use kallithea.lib.compat for json - and nothing else

diff --git a/kallithea/bin/base.py b/kallithea/bin/base.py
--- a/kallithea/bin/base.py
+++ b/kallithea/bin/base.py
@@ -31,13 +31,7 @@ import random
 import urllib2
 import pprint
 
-try:
-    from kallithea.lib.ext_json import json
-except ImportError:
-    try:
-        import simplejson as json
-    except ImportError:
-        import json
+from kallithea.lib.compat import json
 
 CONFIG_NAME = '.config/kallithea'
 FORMAT_PRETTY = 'pretty'
diff --git a/kallithea/bin/ldap_sync.py b/kallithea/bin/ldap_sync.py
--- a/kallithea/bin/ldap_sync.py
+++ b/kallithea/bin/ldap_sync.py
@@ -29,13 +29,7 @@ import ldap
 import urllib2
 import uuid
 
-try:
-    from kallithea.lib.compat import json
-except ImportError:
-    try:
-        import simplejson as json
-    except ImportError:
-        import json
+from kallithea.lib.compat import json
 
 from ConfigParser import ConfigParser
 
diff --git a/kallithea/lib/ext_json.py b/kallithea/lib/ext_json.py
--- a/kallithea/lib/ext_json.py
+++ b/kallithea/lib/ext_json.py
@@ -3,7 +3,7 @@ import functools
 import decimal
 import imp
 
-__all__ = ['json', 'simplejson', 'stdlibjson']
+__all__ = ['json']
 
 
 def _is_aware(value):