Ticket #7131: simplejson-1.9.2.patch

simplejson/__init__.py

@@ -108 +108 @@
 if __name__ == '__main__':
     import warnings
     warnings.warn('python -msimplejson is deprecated, use python -msiplejson.tool', DeprecationWarning)
-    from simplejson.decoder import JSONDecoder
-    from simplejson.encoder import JSONEncoder
+    from django.utils.simplejson.decoder import JSONDecoder
+    from django.utils.simplejson.encoder import JSONEncoder
 else:
     from decoder import JSONDecoder
     from encoder import JSONEncoder

simplejson/decoder.py

@@ -4 +4 @@
 import re
 import sys
 
-from simplejson.scanner import Scanner, pattern
+from django.utils.simplejson.scanner import Scanner, pattern
 try:
-    from simplejson._speedups import scanstring as c_scanstring
+    from django.utils.simplejson._speedups import scanstring as c_scanstring
 except ImportError:
     pass
 

simplejson/encoder.py

@@ -4 +4 @@
 import re
 
 try:
-    from simplejson._speedups import encode_basestring_ascii as c_encode_basestring_ascii
+    from django.utils.simplejson._speedups import encode_basestring_ascii as c_encode_basestring_ascii
 except ImportError:
     pass
 

simplejson/tool.py

@@ -12 +12 @@
 Note that the JSON produced by this module's default settings
 is a subset of YAML, so it may be used as a serializer for that as well.
 """
-import simplejson
+import django.utils.simplejson
 
 #
 # Pretty printer: