diff options
| author | b <b@banjiewen.net> | 2010-04-09 10:52:37 -0700 |
|---|---|---|
| committer | b <b@banjiewen.net> | 2010-04-09 10:52:37 -0700 |
| commit | c929cf5329e7a4a6d5b535b96c1e5a6b1394e7f4 (patch) | |
| tree | 409bf6b3db512eb086dd4fba9c7f8f276e2efe90 | |
| parent | e943cd97c088395dd71e17dde9b407e98cff58ba (diff) | |
| download | anyjson-c929cf5329e7a4a6d5b535b96c1e5a6b1394e7f4.tar.gz | |
added "yajl" module to anyjson & tests.
| -rw-r--r-- | anyjson/__init__.py | 3 | ||||
| -rw-r--r-- | tests/benchmark.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/anyjson/__init__.py b/anyjson/__init__.py index b6a916c..d9423d3 100644 --- a/anyjson/__init__.py +++ b/anyjson/__init__.py @@ -35,7 +35,8 @@ implementation = None methods, as well as the exception they throw. Exception can be either an exception class or a string. """ -_modules = [("cjson", "encode", "EncodeError", "decode", "DecodeError"), +_modules = [("yajl", "dumps", TypeError, "loads", ValueError), + ("cjson", "encode", "EncodeError", "decode", "DecodeError"), ("jsonlib2", "write", "WriteError", "read", "ReadError"), ("jsonlib", "write", "WriteError", "read", "ReadError"), ("simplejson", "dumps", TypeError, "loads", ValueError), diff --git a/tests/benchmark.py b/tests/benchmark.py index 0c61a66..e0c06fa 100644 --- a/tests/benchmark.py +++ b/tests/benchmark.py @@ -91,6 +91,7 @@ def do_benchmark(impspec, json, runs=10): modules = [("json", "loads"), ("simplejson", "loads"), + ("yajl", "loads"), ("cjson", "decode"), ("django.utils.simplejson", "loads"), ("jsonpickle", "decode"), |