reverted simplejson

2014-09-15 18:30:37 -05:00
parent 2b50cf27e2
commit df234fa252
7 changed files with 12 additions and 3 deletions
@@ -121,6 +121,7 @@ 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:
@@ -410,7 +411,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:
@@ -436,3 +437,4 @@ def _toggle_speedups(enabled):
       encoding='utf-8',
       default=None,
   )
+