# HG changeset patch # User Marcin Kuzminski # Date 1336692619 -7200 # Node ID 8a3a1a59a05088178f1b7342d6c0883d1e7069dc # Parent 790398822cada409d5367ebd4c25d81a876a5926 Fixed simplejson import on python 2.5 diff -r 790398822cad -r 8a3a1a59a050 rhodecode/lib/ext_json.py --- a/rhodecode/lib/ext_json.py Thu May 10 20:21:05 2012 +0200 +++ b/rhodecode/lib/ext_json.py Fri May 11 01:30:19 2012 +0200 @@ -81,22 +81,24 @@ _sj = None -# simplejson not found try out regular json module -import json as _json - +try: + # simplejson not found try out regular json module + import json as _json -# extended JSON encoder for json -class ExtendedEncoder(_json.JSONEncoder): - def default(self, obj): - try: - return _obj_dump(obj) - except NotImplementedError: - pass - return _json.JSONEncoder.default(self, 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) -stdlib = _json + # extended JSON encoder for json + class ExtendedEncoder(_json.JSONEncoder): + def default(self, obj): + try: + return _obj_dump(obj) + except NotImplementedError: + pass + return _json.JSONEncoder.default(self, 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) + stdlib = _json +except ImportError: + _json = None # set all available json modules simplejson = _sj