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
159f12e3
Commit
159f12e3
authored
Nov 29, 2012
by
Ezio Melotti
Browse files
Options
Browse Files
Download
Plain Diff
#16549: merge with 3.2.
parents
4cee810f
4927633a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Lib/test/json_tests/test_tool.py
Lib/test/json_tests/test_tool.py
+2
-2
No files found.
Lib/test/json_tests/test_tool.py
View file @
159f12e3
...
...
@@ -42,7 +42,7 @@ class TestTool(unittest.TestCase):
(
sys
.
executable
,
'-m'
,
'json.tool'
),
stdin
=
subprocess
.
PIPE
,
stdout
=
subprocess
.
PIPE
)
as
proc
:
out
,
err
=
proc
.
communicate
(
self
.
data
.
encode
())
self
.
assertEqual
(
out
,
self
.
expect
.
encode
())
self
.
assertEqual
(
out
.
splitlines
(),
self
.
expect
.
encode
().
splitlines
())
self
.
assertEqual
(
err
,
None
)
def
_create_infile
(
self
):
...
...
@@ -55,7 +55,7 @@ class TestTool(unittest.TestCase):
def
test_infile_stdout
(
self
):
infile
=
self
.
_create_infile
()
rc
,
out
,
err
=
assert_python_ok
(
'-m'
,
'json.tool'
,
infile
)
self
.
assertEqual
(
out
,
self
.
expect
.
encode
())
self
.
assertEqual
(
out
.
splitlines
(),
self
.
expect
.
encode
().
splitlines
())
self
.
assertEqual
(
err
,
b''
)
def
test_infile_outfile
(
self
):
...
...
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