diff options
| author | Bob Ippolito <bob@redivi.com> | 2009-03-29 22:33:58 (GMT) |
|---|---|---|
| committer | Bob Ippolito <bob@redivi.com> | 2009-03-29 22:33:58 (GMT) |
| commit | 76a982a027d72287a6d9113b1d65ec6d327d744d (patch) | |
| tree | 0c2536d595c4b31e9bc996609123129e02b4543c /Lib/json/tests/test_decode.py | |
| parent | 8e1a3381293466a6d9a3873b46194a4ed9277619 (diff) | |
| download | cpython-76a982a027d72287a6d9113b1d65ec6d327d744d.zip cpython-76a982a027d72287a6d9113b1d65ec6d327d744d.tar.gz cpython-76a982a027d72287a6d9113b1d65ec6d327d744d.tar.bz2 | |
Issue 5381: fix regression in pure python code path, Issue 5584: fix a decoder bug for unicode float literals outside of a container
Diffstat (limited to 'Lib/json/tests/test_decode.py')
| -rw-r--r-- | Lib/json/tests/test_decode.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Lib/json/tests/test_decode.py b/Lib/json/tests/test_decode.py index 0744b52..7109527 100644 --- a/Lib/json/tests/test_decode.py +++ b/Lib/json/tests/test_decode.py @@ -1,5 +1,6 @@ import decimal from unittest import TestCase +from StringIO import StringIO import json from collections import OrderedDict @@ -27,12 +28,14 @@ class TestDecode(TestCase): p = [("xkd", 1), ("kcw", 2), ("art", 3), ("hxm", 4), ("qrt", 5), ("pad", 6), ("hoy", 7)] self.assertEqual(json.loads(s), eval(s)) - self.assertEqual(json.loads(s, object_pairs_hook = lambda x: x), p) - od = json.loads(s, object_pairs_hook = OrderedDict) + self.assertEqual(json.loads(s, object_pairs_hook=lambda x: x), p) + self.assertEqual(json.load(StringIO(s), + object_pairs_hook=lambda x: x), p) + od = json.loads(s, object_pairs_hook=OrderedDict) self.assertEqual(od, OrderedDict(p)) self.assertEqual(type(od), OrderedDict) # the object_pairs_hook takes priority over the object_hook self.assertEqual(json.loads(s, - object_pairs_hook = OrderedDict, - object_hook = lambda x: None), + object_pairs_hook=OrderedDict, + object_hook=lambda x: None), OrderedDict(p)) |