Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
6a7f2e72
Commit
6a7f2e72
authored
Apr 13, 2011
by
Ezio Melotti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#9233: Fix json to work properly even when _json is not available.
parent
12c759ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
Lib/json/decoder.py
Lib/json/decoder.py
+1
-1
Lib/json/scanner.py
Lib/json/scanner.py
+1
-0
Misc/NEWS
Misc/NEWS
+4
-2
No files found.
Lib/json/decoder.py
View file @
6a7f2e72
...
...
@@ -214,7 +214,7 @@ def JSONObject(s_and_end, strict, scan_once, object_hook, object_pairs_hook,
pairs
=
object_hook
(
pairs
)
return
pairs
,
end
def
JSONArray
(
s_and_end
,
scan_once
,
context
,
_w
=
WHITESPACE
.
match
):
def
JSONArray
(
s_and_end
,
scan_once
,
_w
=
WHITESPACE
.
match
,
_ws
=
WHITESPACE_STR
):
s
,
end
=
s_and_end
values
=
[]
nextchar
=
s
[
end
:
end
+
1
]
...
...
Lib/json/scanner.py
View file @
6a7f2e72
...
...
@@ -22,6 +22,7 @@ def py_make_scanner(context):
parse_int
=
context
.
parse_int
parse_constant
=
context
.
parse_constant
object_hook
=
context
.
object_hook
object_pairs_hook
=
context
.
object_pairs_hook
def
_scan_once
(
string
,
idx
):
try
:
...
...
Misc/NEWS
View file @
6a7f2e72
...
...
@@ -51,9 +51,11 @@ Core and Builtins
Library
-------
- Issue #11703 - urllib2.geturl() does not return correct url when the original
- Issue #9233: Fix json to work properly even when _json is not available.
- Issue #11703: urllib2.geturl() does not return correct url when the original
url contains #fragment.
- Issue #10019: Fixed regression in json module where an indent of 0 stopped
adding newlines and acted instead like 'None'.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment