mirror of
https://github.com/python/cpython.git
synced 2026-01-06 15:32:22 +00:00
[3.13] gh-129900: Fix SystemExit return codes when the REPL is started from the command line (GH-129901) (#131734)
gh-129900: Fix `SystemExit` return codes when the REPL is started from the command line (GH-129901)
(cherry picked from commit 90b82f2b61)
Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
This commit is contained in:
parent
9c7ef0cc28
commit
91ae3307ee
3 changed files with 23 additions and 2 deletions
|
|
@ -285,6 +285,27 @@ def check_exit_message(code, expected, **env_vars):
|
|||
r'import sys; sys.exit("h\xe9")',
|
||||
b"h\xe9", PYTHONIOENCODING='latin-1')
|
||||
|
||||
@support.requires_subprocess()
|
||||
def test_exit_codes_under_repl(self):
|
||||
# GH-129900: SystemExit, or things that raised it, didn't
|
||||
# get their return code propagated by the REPL
|
||||
import tempfile
|
||||
|
||||
exit_ways = [
|
||||
"exit",
|
||||
"__import__('sys').exit",
|
||||
"raise SystemExit"
|
||||
]
|
||||
|
||||
for exitfunc in exit_ways:
|
||||
for return_code in (0, 123):
|
||||
with self.subTest(exitfunc=exitfunc, return_code=return_code):
|
||||
with tempfile.TemporaryFile("w+") as stdin:
|
||||
stdin.write(f"{exitfunc}({return_code})\n")
|
||||
stdin.seek(0)
|
||||
proc = subprocess.run([sys.executable], stdin=stdin)
|
||||
self.assertEqual(proc.returncode, return_code)
|
||||
|
||||
def test_getdefaultencoding(self):
|
||||
self.assertRaises(TypeError, sys.getdefaultencoding, 42)
|
||||
# can't check more than the type, as the user might have changed it
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Fix return codes inside :exc:`SystemExit` not getting returned by the REPL.
|
||||
|
|
@ -572,8 +572,7 @@ pymain_run_stdin(PyConfig *config)
|
|||
int run = PyRun_AnyFileExFlags(stdin, "<stdin>", 0, &cf);
|
||||
return (run != 0);
|
||||
}
|
||||
int run = pymain_run_module(L"_pyrepl", 0);
|
||||
return (run != 0);
|
||||
return pymain_run_module(L"_pyrepl", 0);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue