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
4cee810f
Commit
4cee810f
authored
Nov 29, 2012
by
Ezio Melotti
Browse files
Options
Browse Files
Download
Plain Diff
#16476: merge with 3.2.
parents
1e86d01e
b32512ed
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
9 deletions
+12
-9
Lib/json/tool.py
Lib/json/tool.py
+2
-1
Lib/test/json_tests/test_tool.py
Lib/test/json_tests/test_tool.py
+8
-8
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/json/tool.py
View file @
4cee810f
...
...
@@ -31,7 +31,8 @@ def main():
except
ValueError
as
e
:
raise
SystemExit
(
e
)
with
outfile
:
json
.
dump
(
obj
,
outfile
,
sort_keys
=
True
,
indent
=
4
)
json
.
dump
(
obj
,
outfile
,
sort_keys
=
True
,
indent
=
4
,
separators
=
(
','
,
': '
))
outfile
.
write
(
'
\
n
'
)
...
...
Lib/test/json_tests/test_tool.py
View file @
4cee810f
...
...
@@ -19,19 +19,19 @@ class TestTool(unittest.TestCase):
[
[
"blorpie"
],
],
[
"whoops"
],
[],
"d-shtaeou",
"d-nthiouh",
"i-vhbjkhnth",
],
[],
"d-shtaeou",
"d-nthiouh",
"i-vhbjkhnth",
{
"nifty": 87
},
},
{
"field": "yes",
"field": "yes",
"morefield": false
}
]
...
...
Misc/NEWS
View file @
4cee810f
...
...
@@ -96,6 +96,8 @@ Core and Builtins
Library
-------
-
Issue
#
16476
:
Fix
json
.
tool
to
avoid
including
trailing
whitespace
.
-
Issue
#
16549
:
Make
json
.
tool
work
again
on
Python
3
and
add
tests
.
Initial
patch
by
Berker
Peksag
and
Serhiy
Storchaka
.
...
...
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