From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 25 Mar 2025 20:15:00 +0000 (+0100)
Subject: [3.13] gh-129900: Fix `SystemExit` return codes when the REPL is started from the... 
X-Git-Tag: v3.13.3~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91ae3307ee571a5b13c3be102fa8afb117c3a4d7;p=thirdparty%2FPython%2Fcpython.git

[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 90b82f2b61219c8f94e2deddc989a4c4fe9ea7c7)

Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
---

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 19597eb75f91..72d51361e0b4 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -285,6 +285,27 @@ class SysModuleTest(unittest.TestCase):
             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
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-02-09-09-54-37.gh-issue-129900.GAGGPn.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-02-09-09-54-37.gh-issue-129900.GAGGPn.rst
new file mode 100644
index 000000000000..df15114cff7e
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-02-09-09-54-37.gh-issue-129900.GAGGPn.rst
@@ -0,0 +1 @@
+Fix return codes inside :exc:`SystemExit` not getting returned by the REPL.
diff --git a/Modules/main.c b/Modules/main.c
index 3bf2241f2837..581c87270ff9 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -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);
 }