kallithea Changeset - 9d7f9914fa8c

Changeset - 9d7f9914fa8c

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 11 years ago 2015-01-06 00:54:36
madski@unity3d.com

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

3 files changed with 3 insertions and 15 deletions:

kallithea/bin/base.py

kallithea/bin/ldap_sync.py

kallithea/lib/ext_json.py

0 comments (0 inline, 0 general)

kallithea/bin/base.py

➞

Show inline comments

@@ @@ -28,19 +28,13 @@ Original author and date, and relevant c @@
 import os
 import sys
 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'
 FORMAT_JSON = 'json'

kallithea/bin/ldap_sync.py

➞

Show inline comments

@@ @@ -26,19 +26,13 @@ Original author and date, and relevant c @@
 """
 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
 config = ConfigParser()
 config.read('ldap_sync.conf')

kallithea/lib/ext_json.py

➞

Show inline comments

 import datetime
 import functools
 import decimal
 import imp
-__all__ = ['json', 'simplejson', 'stdlibjson']
 __all__ = ['json']
 def _is_aware(value):
     """
     Determines if a given datetime.time is aware.

0 comments (0 inline, 0 general)