re http://code.google.com/p/simplejson/issues/detail?id=85

git-svn-id: http://simplejson.googlecode.com/svn/trunk@236 a4795897-2c25-0410-b006-0d3caba88fa1

CHANGES.txt

 Version 2.1.2 released XXXX-XX-XX
 
+* Correct wrong end when object_pairs_hook is used
+  http://code.google.com/p/simplejson/issues/detail?id=85
 * Correct output for indent=0
   http://bugs.python.org/issue10019
 * Correctly raise TypeError when non-string keys are used with speedups

simplejson/decoder.py

@@ -197,7 +197,7 @@
         if nextchar == '}':
             if object_pairs_hook is not None:
                 result = object_pairs_hook(pairs)
-                return result, end
+                return result, end + 1
             pairs = {}
             if object_hook is not None:
                 pairs = object_hook(pairs)

simplejson/tests/test_decode.py

@@ -71,3 +71,13 @@
         self.assertEqual(json.loads(u'""'), u"")
         self.assertEqual(json.loads('[""]'), [""])
         self.assertEqual(json.loads(u'[""]'), [u""])
+
+    def test_raw_decode(self):
+        cls = json.decoder.JSONDecoder
+        self.assertEqual(
+            ({'a': {}}, 9),
+            cls().raw_decode("{\"a\": {}}"))
+        # http://code.google.com/p/simplejson/issues/detail?id=85
+        self.assertEqual(
+            ({'a': {}}, 9),
+            cls(object_pairs_hook=dict).raw_decode("{\"a\": {}}"))