summaryrefslogtreecommitdiff
path: root/simplejson
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2012-07-27 21:59:46 -0700
committerBob Ippolito <bob@redivi.com>2012-07-27 21:59:46 -0700
commit6f5ca6ba4d2f71958176756eac2ac7fe6ec62537 (patch)
tree52a68a2b4bdda7227c8586b8e948eaa2991e7ed7 /simplejson
parent5178cb760e35a8a921fd509f7d5da383d122d54e (diff)
downloadsimplejson-6f5ca6ba4d2f71958176756eac2ac7fe6ec62537.tar.gz
bump version to 2.6.1 and add test/docs for #38 raw_decode fixv2.6.1
Diffstat (limited to 'simplejson')
-rw-r--r--simplejson/__init__.py2
-rw-r--r--simplejson/tests/test_decode.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index 04a8aa6..dcf072d 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -97,7 +97,7 @@ Using simplejson.tool from the shell to validate and pretty-print::
$ echo '{ 1.2:3.4}' | python -m simplejson.tool
Expecting property name: line 1 column 2 (char 2)
"""
-__version__ = '2.6.0'
+__version__ = '2.6.1'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
diff --git a/simplejson/tests/test_decode.py b/simplejson/tests/test_decode.py
index a140a13..37b231b 100644
--- a/simplejson/tests/test_decode.py
+++ b/simplejson/tests/test_decode.py
@@ -81,3 +81,7 @@ class TestDecode(TestCase):
self.assertEqual(
({'a': {}}, 9),
cls(object_pairs_hook=dict).raw_decode("{\"a\": {}}"))
+ # https://github.com/simplejson/simplejson/pull/38
+ self.assertEqual(
+ ({'a': {}}, 11),
+ cls().raw_decode(" \n{\"a\": {}}"))