kallithea Changeset - c796b6bdd532

Changeset - c796b6bdd532

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

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

json: drop simplejson fallback and just use stdlib

The performance gain from using simplejson is questionable and undocumented for
our use. Keep it simple.

1 file changed with 14 insertions and 59 deletions:

kallithea/lib/ext_json.py

0 comments (0 inline, 0 general)

kallithea/lib/ext_json.py

➞

Show inline comments

 """
 Extended JSON encoder for json
 json.org do not specify how date time can be represented - monkeypatch it to do something.
 """
 import datetime
 import functools
 import decimal
-import imp
+import json # is re-exported after monkey patching
 __all__ = ['json']
-def _is_aware(value):
+def _is_tz_aware(value):
     """
     Determines if a given datetime.time is aware.
+    Determines if a given datetime.time is timezone aware.
     The logic is described in Python's docs:
     http://docs.python.org/library/datetime.html#datetime.tzinfo
     """
     return (value.tzinfo is not None
             and value.tzinfo.utcoffset(value) is not None)
 def _obj_dump(obj):
     """
     Custom function for dumping objects to JSON, if obj has __json__ attribute
     or method defined it will be used for serialization
     :param obj:
@@ @@ -38,13 +43,13 @@ def _obj_dump(obj): @@
         return r
     elif isinstance(obj, datetime.date):
         return obj.isoformat()
     elif isinstance(obj, decimal.Decimal):
         return str(obj)
     elif isinstance(obj, datetime.time):
-        if _is_aware(obj):
+        if _is_tz_aware(obj):
             raise ValueError("JSON can't represent timezone-aware times.")
         r = obj.isoformat()
         if obj.microsecond:
             r = r[:12]
         return r
     elif isinstance(obj, set):
@@ @@ -55,68 +60,18 @@ def _obj_dump(obj): @@
         else:
             return obj.__json__
     else:
         raise NotImplementedError
 # Import simplejson
 try:
     # import simplejson initially
     _sj = imp.load_module('_sj', *imp.find_module('simplejson'))
     def extended_encode(obj):
         try:
             return _obj_dump(obj)
         except NotImplementedError:
             pass
         raise TypeError("%r is not JSON serializable" % (obj,))
     # we handle decimals our own it makes unified behavior of json vs
     # simplejson
     sj_version = [int(x) for x in _sj.__version__.split('.')]
     major, minor = sj_version[0], sj_version[1]
     if major < 2 or (major == 2 and minor < 1):
         # simplejson < 2.1 doesnt support use_decimal
         _sj.dumps = functools.partial(_sj.dumps,
                                              default=extended_encode)
         _sj.dump = functools.partial(_sj.dump,
                                             default=extended_encode)
     else:
         _sj.dumps = functools.partial(_sj.dumps,
                                              default=extended_encode,
                                              use_decimal=False)
         _sj.dump = functools.partial(_sj.dump,
                                             default=extended_encode,
                                             use_decimal=False)
     simplejson = _sj
 except ImportError:
     # no simplejson set it to None
     simplejson = None
 try:
     # simplejson not found try out regular json module
     _json = imp.load_module('_json', *imp.find_module('json'))
     # extended JSON encoder for json
     class ExtendedEncoder(_json.JSONEncoder):
 class ExtendedEncoder(json.JSONEncoder):
         def default(self, obj):
             try:
                 return _obj_dump(obj)
             except NotImplementedError:
                 pass
             raise TypeError("%r is not JSON serializable" % (obj,))
     # monkey-patch JSON encoder to use extended version
     _json.dumps = functools.partial(_json.dumps, cls=ExtendedEncoder)
     _json.dump = functools.partial(_json.dump, cls=ExtendedEncoder)
     stdlibjson = _json
 except ImportError:
     stdlibjson = None
 # set all available json modules
 if simplejson:
     json = _sj
 elif stdlibjson:
     json = _json
 else:
     raise ImportError('Could not find any json modules')
 # monkey-patch and export JSON encoder to use custom encoding method
 json.dumps = functools.partial(json.dumps, cls=ExtendedEncoder)
 json.dump = functools.partial(json.dump, cls=ExtendedEncoder)

0 comments (0 inline, 0 general)