merge 3.6

2016-09-12 22:10:02 -07:00 · 2016-09-12 22:10:02 -07:00 · 58c1f14ca1
parent 98deab5e4e 7a9e993f41
commit 58c1f14ca1
1 changed files with 2 additions and 1 deletions
--- 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: