From 46d1e7cc606a8ad67226fbcb28e225de49e73430 Mon Sep 17 00:00:00 2001 From: Rune Halvorsen Date: Thu, 9 Sep 2010 16:55:06 +0200 Subject: [PATCH] Added dumps/loads as aliases for serializ/deserialize so it's in line with the stdlib json module --- anyjson/__init__.py | 2 ++ tests/test_implementations.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/anyjson/__init__.py b/anyjson/__init__.py index 9e0295c..b1253b4 100644 --- a/anyjson/__init__.py +++ b/anyjson/__init__.py @@ -123,3 +123,5 @@ else: serialize = lambda value: implementation.serialize(value) deserialize = lambda value: implementation.deserialize(value) + dumps = serialize + loads = deserialize diff --git a/tests/test_implementations.py b/tests/test_implementations.py index e53e483..ceec00c 100644 --- a/tests/test_implementations.py +++ b/tests/test_implementations.py @@ -5,10 +5,12 @@ modnames = [e[0] for e in anyjson._modules] def test_default_serialization(): assert anyjson.serialize([1,2,3]).replace(" ", "") == "[1,2,3]" + assert anyjson.dumps([1,2,3]).replace(" ", "") == "[1,2,3]" def test_default_deserialization(): assert anyjson.deserialize("[1,2,3]") == [1,2,3] + assert anyjson.loads("[1,2,3]") == [1,2,3] def test_forced_serialization(): @@ -19,6 +21,7 @@ def test_forced_serialization(): continue # module can't be tested, try next assert anyjson.serialize([1,2,3]).replace(" ", "") == "[1,2,3]" + assert anyjson.dumps([1,2,3]).replace(" ", "") == "[1,2,3]" def test_forced_deserialization(): @@ -29,6 +32,7 @@ def test_forced_deserialization(): continue # module can't be tested, try next assert anyjson.deserialize("[1,2,3]") == [1,2,3] + assert anyjson.loads("[1,2,3]") == [1,2,3] def test_exceptions(): @@ -39,5 +43,7 @@ def test_exceptions(): continue # module can't be tested, try next assert_raises(TypeError, anyjson.serialize, [object()]) + assert_raises(TypeError, anyjson.dumps, [object()]) assert_raises(ValueError, anyjson.deserialize, "[") + assert_raises(ValueError, anyjson.loads, "[")