kallithea Changeset - 5c8b1eaafe77

Changeset - 5c8b1eaafe77

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-07-01 17:49:42
marcin@python-works.com

Simplified ext_json thing, for better scope resolution in pydev

1 file changed with 21 insertions and 16 deletions:

rhodecode/lib/ext_json.py

0 comments (0 inline, 0 general)

rhodecode/lib/ext_json.py

➞

Show inline comments

@@ @@ -60,7 +60,7 @@ def _obj_dump(obj): @@
 # Import simplejson
 try:
     # import simplejson initially
-    import simplejson as _sj
     import simplejson
     def extended_encode(obj):
         try:
@@ @@ -70,37 +70,42 @@ try: @@
         raise TypeError("%r is not JSON serializable" % (obj,))
     # we handle decimals our own it makes unified behavior of json vs
     # simplejson
     _sj.dumps = functools.partial(_sj.dumps, default=extended_encode,
     simplejson.dumps = functools.partial(simplejson.dumps,
                                          default=extended_encode,
                                   use_decimal=False)
     _sj.dump = functools.partial(_sj.dump, default=extended_encode,
     simplejson.dump = functools.partial(simplejson.dump,
                                         default=extended_encode,
                                  use_decimal=False)
     simplejson = _sj
 except ImportError:
     # no simplejson set it to None
-    _sj = None
+    simplejson = None
 try:
     # simplejson not found try out regular json module
-    import json as _json
     import 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
-            return _json.JSONEncoder.default(self, obj)
+            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
     json.dumps = functools.partial(json.dumps, cls=ExtendedEncoder)
     json.dump = functools.partial(json.dump, cls=ExtendedEncoder)
 except ImportError:
     _json = None
     json = None
 stdlib = json
 # set all available json modules
 simplejson = _sj
 stdjson = _json
 json = _sj if _sj else _json
 if simplejson:
     json = simplejson
 elif json:
     json = json
 else:
     raise ImportError('Could not find any json modules')

0 comments (0 inline, 0 general)