summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-09-13 05:09:11 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-09-13 05:09:11 (GMT)
commit529d130eda809ccb97b45145a8dfb4c65e25f41d (patch)
treea366ff2644f5761b2840fbf21e7043f6a89ff8ab
parent35ee948fa5dddbee29b8a5a2abbceaab7f862a95 (diff)
parentac2d1c71534f3de62980b0e953eaf6f31d8fd517 (diff)
downloadcpython-529d130eda809ccb97b45145a8dfb4c65e25f41d.zip
cpython-529d130eda809ccb97b45145a8dfb4c65e25f41d.tar.gz
cpython-529d130eda809ccb97b45145a8dfb4c65e25f41d.tar.bz2
merge heads
-rw-r--r--Lib/test/test_tools/test_fixcid.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_tools/test_fixcid.py b/Lib/test/test_tools/test_fixcid.py
index 7f25c17..bce029b 100644
--- a/Lib/test/test_tools/test_fixcid.py
+++ b/Lib/test/test_tools/test_fixcid.py
@@ -83,7 +83,8 @@ class Test(unittest.TestCase):
script = os.path.join(scriptsdir, "fixcid.py")
with support.swap_attr(sys, "argv", argv), \
support.swap_attr(sys, "stdin", StringIO(input)), \
- support.captured_stdout() as output:
+ support.captured_stdout() as output, \
+ support.captured_stderr():
try:
runpy.run_path(script, run_name="__main__")
except SystemExit as exit: