[Python-checkins] cpython (merge 3.5 -> 3.6): merge 3.5

Tue Sep 13 01:10:17 EDT 2016

https://hg.python.org/cpython/rev/99a70dbece1e
changeset: 103740:99a70dbece1e
branch: 3.6
parent: 103737:4ac3de437100
parent: 103739:a753f6e4501b
user: Benjamin Peterson <benjamin at python.org>
date: Mon Sep 12 22:09:39 2016 -0700
summary:
 merge 3.5
files:
 Lib/test/test_tools/test_fixcid.py | 3 ++-
 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
--- a/Lib/test/test_tools/test_fixcid.py
+++ b/Lib/test/test_tools/test_fixcid.py
@@ -83,7 +83,8 @@
 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:
-- 
Repository URL: https://hg.python.org/cpython
