bpo-30877: Fix clearing a cache in the the JSON decoder. (GH-7048)

This commit is contained in:
Serhiy Storchaka 2018-05-22 14:55:07 +03:00 committed by GitHub
parent 55bfe690d5
commit ae00fb1d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View File

@ -68,6 +68,6 @@ def py_make_scanner(context):
finally: finally:
memo.clear() memo.clear()
return _scan_once return scan_once
make_scanner = c_make_scanner or py_make_scanner make_scanner = c_make_scanner or py_make_scanner

View File

@ -58,7 +58,9 @@ class TestDecode:
def test_keys_reuse(self): def test_keys_reuse(self):
s = '[{"a_key": 1, "b_\xe9": 2}, {"a_key": 3, "b_\xe9": 4}]' s = '[{"a_key": 1, "b_\xe9": 2}, {"a_key": 3, "b_\xe9": 4}]'
self.check_keys_reuse(s, self.loads) self.check_keys_reuse(s, self.loads)
self.check_keys_reuse(s, self.json.decoder.JSONDecoder().decode) decoder = self.json.decoder.JSONDecoder()
self.check_keys_reuse(s, decoder.decode)
self.assertFalse(decoder.memo)
def test_extra_data(self): def test_extra_data(self):
s = '[1, 2, 3]5' s = '[1, 2, 3]5'

View File

@ -0,0 +1,3 @@
Fixed a bug in the Python implementation of the JSON decoder that prevented
the cache of parsed strings from clearing after finishing the decoding.
Based on patch by c-fos.