summaryrefslogtreecommitdiffstats
path: root/Lib/json/decoder.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-05-14 03:24:53 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-05-14 03:24:53 (GMT)
commite3992eb7430101f5bc6725d5f74290777a2ef939 (patch)
tree8300fe6afce165f52da14b5229cdb4ec50161602 /Lib/json/decoder.py
parent720f8dea196640a053135f31be89b652d685e55c (diff)
downloadcpython-e3992eb7430101f5bc6725d5f74290777a2ef939.zip
cpython-e3992eb7430101f5bc6725d5f74290777a2ef939.tar.gz
cpython-e3992eb7430101f5bc6725d5f74290777a2ef939.tar.bz2
#5723: Improve json tests to be executed with and without accelerations.
Diffstat (limited to 'Lib/json/decoder.py')
-rw-r--r--Lib/json/decoder.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index eeebf45..1f2da72 100644
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -4,7 +4,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:
@@ -356,7 +356,7 @@ class JSONDecoder(object):
self.parse_object = JSONObject
self.parse_array = JSONArray
self.parse_string = scanstring
- self.scan_once = make_scanner(self)
+ self.scan_once = scanner.make_scanner(self)
def decode(self, s, _w=WHITESPACE.match):
"""Return the Python representation of ``s`` (a ``str`` or ``unicode``