Blob Blame History Raw
--- anyjson-0.3.3/anyjson/__init__.py	2017-02-10 14:40:44.238386339 -0800
+++ anyjson-0.3.3/anyjson/__init__.py.new	2017-02-10 14:40:46.551395839 -0800
@@ -31,13 +31,11 @@
 #: List of known json modules, and the names of their loads/dumps
 #: methods, as well as the exceptions they throw.  Exception can be either
 #: an exception class or a string.
-_modules = [("yajl", "dumps", TypeError, "loads", ValueError, "load"),
-            ("jsonlib2", "write", "WriteError", "read", "ReadError", None),
-            ("jsonlib", "write", "WriteError", "read", "ReadError", None),
+_modules = [("ujson", "dumps", TypeError, "loads", ValueError, None),
+            ("yajl", "dumps", TypeError, "loads", ValueError, "load"),
+            ("cjson", "encode", "EncodeError", "decode", "DecodeError", None),
             ("simplejson", "dumps", TypeError, "loads", ValueError, "load"),
             ("json", "dumps", TypeError, "loads", ValueError, "load"),
-            ("django.utils.simplejson", "dumps", TypeError, "loads", ValueError, "load"),
-            ("cjson", "encode", "EncodeError", "decode", "DecodeError", None)
            ]
 
 _fields = ("modname", "encoder", "encerror",
@@ -50,10 +48,6 @@
     def __init__(self, modspec):
         modinfo = dict(zip(_fields, modspec))
 
-        if modinfo["modname"] == "cjson":
-            import warnings
-            warnings.warn("cjson is deprecated! See http://pypi.python.org/pypi/python-cjson/1.0.5", DeprecationWarning)
-
         # No try block. We want importerror to end up at caller
         module = self._attempt_load(modinfo["modname"])