[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #27952: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/33d118a27035
changeset:   103734:33d118a27035
branch:      3.6
parent:      103731:095c77323a6e
parent:      103733:5ae3782c4e05
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Tue Sep 13 07:56:21 2016 +0300
summary:
  Issue #27952: Merge from 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