diff options
| author | Ezio Melotti <none@none> | 2011-05-14 03:47:51 (GMT) |
|---|---|---|
| committer | Ezio Melotti <none@none> | 2011-05-14 03:47:51 (GMT) |
| commit | 6b60fb9148738de1525bbf5c7ddadc16a474c635 (patch) | |
| tree | e720267d24b84f52de329af4415057e9335917e4 /Lib/json | |
| parent | 3659f27ad37f992fadc1692137edf32c01c5bc66 (diff) | |
| download | cpython-6b60fb9148738de1525bbf5c7ddadc16a474c635.zip cpython-6b60fb9148738de1525bbf5c7ddadc16a474c635.tar.gz cpython-6b60fb9148738de1525bbf5c7ddadc16a474c635.tar.bz2 | |
#5723: merge with 3.1.
Diffstat (limited to 'Lib/json')
| -rw-r--r-- | Lib/json/decoder.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py index a19cf0f..3174e31 100644 --- a/Lib/json/decoder.py +++ b/Lib/json/decoder.py @@ -5,7 +5,7 @@ import re import sys import struct -from json.scanner import make_scanner +from json import scanner try: from _json import scanstring as c_scanstring except ImportError: @@ -340,7 +340,7 @@ class JSONDecoder(object): self.parse_array = JSONArray self.parse_string = scanstring self.memo = {} - self.scan_once = make_scanner(self) + self.scan_once = scanner.make_scanner(self) def decode(self, s, _w=WHITESPACE.match): |