|
 |
4b5aefc |
--- anyjson-0.3.3/anyjson/__init__.py 2017-02-10 14:45:17.898510326 -0800
|
|
|
4b5aefc |
+++ anyjson-0.3.3/anyjson/__init__.py.new 2017-02-10 14:45:27.501549767 -0800
|
|
|
4b5aefc |
@@ -32,12 +32,9 @@
|
|
|
4b5aefc |
#: methods, as well as the exceptions they throw. Exception can be either
|
|
|
4b5aefc |
#: an exception class or a string.
|
|
|
4b5aefc |
_modules = [("yajl", "dumps", TypeError, "loads", ValueError, "load"),
|
|
|
4b5aefc |
- ("jsonlib2", "write", "WriteError", "read", "ReadError", None),
|
|
|
4b5aefc |
- ("jsonlib", "write", "WriteError", "read", "ReadError", None),
|
|
|
4b5aefc |
+ ("cjson", "encode", "EncodeError", "decode", "DecodeError", None),
|
|
|
4b5aefc |
("simplejson", "dumps", TypeError, "loads", ValueError, "load"),
|
|
|
4b5aefc |
("json", "dumps", TypeError, "loads", ValueError, "load"),
|
|
|
4b5aefc |
- ("django.utils.simplejson", "dumps", TypeError, "loads", ValueError, "load"),
|
|
|
4b5aefc |
- ("cjson", "encode", "EncodeError", "decode", "DecodeError", None)
|
|
|
4b5aefc |
]
|
|
|
4b5aefc |
|
|
|
4b5aefc |
_fields = ("modname", "encoder", "encerror",
|
|
|
4b5aefc |
@@ -50,10 +47,6 @@
|
|
|
4b5aefc |
def __init__(self, modspec):
|
|
|
4b5aefc |
modinfo = dict(zip(_fields, modspec))
|
|
|
4b5aefc |
|
|
|
4b5aefc |
- if modinfo["modname"] == "cjson":
|
|
|
4b5aefc |
- import warnings
|
|
|
4b5aefc |
- warnings.warn("cjson is deprecated! See http://pypi.python.org/pypi/python-cjson/1.0.5", DeprecationWarning)
|
|
|
4b5aefc |
-
|
|
|
4b5aefc |
# No try block. We want importerror to end up at caller
|
|
|
4b5aefc |
module = self._attempt_load(modinfo["modname"])
|
|
|
4b5aefc |
|