Commit 529d130e authored by Benjamin Peterson's avatar Benjamin Peterson

merge heads

parents 35ee948f ac2d1c71
...@@ -83,7 +83,8 @@ class Test(unittest.TestCase): ...@@ -83,7 +83,8 @@ class Test(unittest.TestCase):
script = os.path.join(scriptsdir, "fixcid.py") script = os.path.join(scriptsdir, "fixcid.py")
with support.swap_attr(sys, "argv", argv), \ with support.swap_attr(sys, "argv", argv), \
support.swap_attr(sys, "stdin", StringIO(input)), \ support.swap_attr(sys, "stdin", StringIO(input)), \
support.captured_stdout() as output: support.captured_stdout() as output, \
support.captured_stderr():
try: try:
runpy.run_path(script, run_name="__main__") runpy.run_path(script, run_name="__main__")
except SystemExit as exit: except SystemExit as exit:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment