mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

#5723: merge with 3.1.

Browse source
This commit is contained in:
Ezio Melotti 2011-05-14 06:47:51 +03:00
parent 3659f27ad3
commit 6b60fb9148
19 changed files with 253 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/json/decoder.py
View file

@ -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):