Mercurial > kallithea

changeset 4728:9d7f9914fa8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
json: always use kallithea.lib.compat for json - and nothing else
author Mads Kiilerich <madski@unity3d.com>
date Tue, 06 Jan 2015 00:54:36 +0100
parents 9cf229b46e49
children c796b6bdd532
files kallithea/bin/base.py kallithea/bin/ldap_sync.py kallithea/lib/ext_json.py
diffstat 3 files changed, 3 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/bin/base.py	Wed Feb 27 01:26:41 2013 +0100
+++ b/kallithea/bin/base.py	Tue Jan 06 00:54:36 2015 +0100
@@ -31,13 +31,7 @@
 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'
--- a/kallithea/bin/ldap_sync.py	Wed Feb 27 01:26:41 2013 +0100
+++ b/kallithea/bin/ldap_sync.py	Tue Jan 06 00:54:36 2015 +0100
@@ -29,13 +29,7 @@
 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
 
--- a/kallithea/lib/ext_json.py	Wed Feb 27 01:26:41 2013 +0100
+++ b/kallithea/lib/ext_json.py	Tue Jan 06 00:54:36 2015 +0100
@@ -3,7 +3,7 @@
 import decimal
 import imp
 
-__all__ = ['json', 'simplejson', 'stdlibjson']
+__all__ = ['json']
 
 
 def _is_aware(value):