upgraded simplejson

2014-09-14 16:37:09 -05:00
parent e38565345c
commit 0120ad5b95
10 changed files with 16 additions and 27 deletions
@@ -121,7 +121,6 @@ OrderedDict = _import_OrderedDict()

 def _import_c_make_encoder():
    try:
-        raise ImportError # because assumes simplejson in path
        from simplejson._speedups import make_encoder
        return make_encoder
    except ImportError:
@@ -411,7 +410,7 @@ def _toggle_speedups(enabled):
    if enabled:
        dec.scanstring = dec.c_scanstring or dec.py_scanstring
        enc.c_make_encoder = c_make_encoder
-        enc.encode_basestring_ascii = (enc.c_encode_basestring_ascii or
+        enc.encode_basestring_ascii = (enc.c_encode_basestring_ascii or 
            enc.py_encode_basestring_ascii)
        scan.make_scanner = scan.c_make_scanner or scan.py_make_scanner
    else:
@@ -437,4 +436,3 @@ def _toggle_speedups(enabled):
       encoding='utf-8',
       default=None,
   )
-