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

[benjamin.peterson]

https://hg.python.org/cpython/rev/1daa6d4250c0
changeset:   103742:1daa6d4250c0
parent:      103738:aa63b94946bf
parent:      103741:96bf30d5387a
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Sep 12 22:10:02 2016 -0700
summary:
  merge 3.6

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