gh-140287: Handle PYTHONSTARTUP script exceptions in the asyncio REPL

Lib/asyncio/__main__.py

@@ -101,7 +101,12 @@ def run(self):
  import tokenize
  with tokenize.open(startup_path) as f:
  startup_code = compile(f.read(), startup_path, "exec")
- exec(startup_code, console.locals)
+ try:
+ exec(startup_code, console.locals)
+ except SystemExit:
+ raise
+ except BaseException:
+ console.showtraceback()
 
  ps1 = getattr(sys, "ps1", ">>> ")
  if CAN_USE_PYREPL:

Lib/test/test_repl.py

@@ -5,6 +5,7 @@
 import subprocess
 import sys
 import unittest
+from contextlib import contextmanager
 from functools import partial
 from textwrap import dedent
 from test import support
@@ -28,7 +29,7 @@
  raise unittest.SkipTest("test module requires subprocess")
 
 
-def spawn_repl(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, custom=False, **kw):
+def spawn_repl(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, custom=False, isolated=True, **kw):
  """Run the Python REPL with the given arguments.
 
  kw is extra keyword args to pass to subprocess.Popen. Returns a Popen
@@ -42,7 +43,11 @@ def spawn_repl(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, custom=F
  # path may be used by PyConfig_Get("module_search_paths") to build the
  # default module search path.
  stdin_fname = os.path.join(os.path.dirname(sys.executable), "<stdin>")
- cmd_line = [stdin_fname, '-I']
+ cmd_line = [stdin_fname]
+ # Isolated mode implies -E, -P and -s, purifies sys.path and ignores PYTHON*
+ # variables.
+ if isolated:
+ cmd_line.append('-I')
  # Don't re-run the built-in REPL from interactive mode
  # if we're testing a custom REPL (such as the asyncio REPL).
  if not custom:
@@ -197,68 +202,6 @@ def foo(x):
  ]
  self.assertEqual(traceback_lines, expected_lines)
 
- def test_pythonstartup_error_reporting(self):
- # errors based on https://github.com/python/cpython/issues/137576
-
- def make_repl(env):
- return subprocess.Popen(
- [os.path.join(os.path.dirname(sys.executable), '<stdin>'), "-i"],
- executable=sys.executable,
- text=True,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT,
- env=env,
- )
-
- # case 1: error in user input, but PYTHONSTARTUP is fine
- with os_helper.temp_dir() as tmpdir:
- script = os.path.join(tmpdir, "pythonstartup.py")
- with open(script, "w") as f:
- f.write("print('from pythonstartup')" + os.linesep)
-
- env = os.environ.copy()
- env['PYTHONSTARTUP'] = script
- env["PYTHON_HISTORY"] = os.path.join(tmpdir, ".pythonhist")
- p = make_repl(env)
- p.stdin.write("1/0")
- output = kill_python(p)
- expected = dedent("""
- Traceback (most recent call last):
- File "<stdin>", line 1, in <module>
- 1/0
- ~^~
- ZeroDivisionError: division by zero
- """)
- self.assertIn("from pythonstartup", output)
- self.assertIn(expected, output)
-
- # case 2: error in PYTHONSTARTUP triggered by user input
- with os_helper.temp_dir() as tmpdir:
- script = os.path.join(tmpdir, "pythonstartup.py")
- with open(script, "w") as f:
- f.write("def foo():\n 1/0\n")
-
- env = os.environ.copy()
- env['PYTHONSTARTUP'] = script
- env["PYTHON_HISTORY"] = os.path.join(tmpdir, ".pythonhist")
- p = make_repl(env)
- p.stdin.write('foo()')
- output = kill_python(p)
- expected = dedent("""
- Traceback (most recent call last):
- File "<stdin>", line 1, in <module>
- foo()
- ~~~^^
- File "%s", line 2, in foo
- 1/0
- ~^~
- ZeroDivisionError: division by zero
- """) % script
- self.assertIn(expected, output)
-
-
-
  def test_runsource_show_syntax_error_location(self):
  user_input = dedent("""def f(x, x): ...
  """)
@@ -292,24 +235,6 @@ def bar(x):
  expected = "(30, None, [\'def foo(x):\\n\', \' return x + 1\\n\', \'\\n\'], \'<stdin>\')"
  self.assertIn(expected, output, expected)
 
- def test_asyncio_repl_reaches_python_startup_script(self):
- with os_helper.temp_dir() as tmpdir:
- script = os.path.join(tmpdir, "pythonstartup.py")
- with open(script, "w") as f:
- f.write("print('pythonstartup done!')" + os.linesep)
- f.write("exit(0)" + os.linesep)
-
- env = os.environ.copy()
- env["PYTHON_HISTORY"] = os.path.join(tmpdir, ".asyncio_history")
- env["PYTHONSTARTUP"] = script
- subprocess.check_call(
- [sys.executable, "-m", "asyncio"],
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- env=env,
- timeout=SHORT_TIMEOUT,
- )
-
  @unittest.skipUnless(pty, "requires pty")
  def test_asyncio_repl_is_ok(self):
  m, s = pty.openpty()
@@ -346,6 +271,64 @@ def test_asyncio_repl_is_ok(self):
  self.assertEqual(exit_code, 0, "".join(output))
 
 
+@contextmanager
+def new_startup_env(*, code: str, histfile: str = ".pythonhist"):
+ with os_helper.temp_dir() as tmpdir:
+ filename = os.path.join(tmpdir, "pythonstartup.py")
+ with open(filename, "w") as f:
+ f.write(os.linesep.join(code.splitlines()))
+ yield {"PYTHONSTARTUP": filename, "PYTHON_HISTORY": os.path.join(tmpdir, histfile)}
+
+
+@support.force_not_colorized_test_class
+class TestPythonStartup(unittest.TestCase):
+ REPLS = [
+ ("REPL", spawn_repl, ".pythonhist"),
+ ("asyncio REPL", spawn_asyncio_repl, ".asyncio_history"),
+ ]
+
+ def test_pythonstartup_success(self):
+ # errors based on https://github.com/python/cpython/issues/137576
+ # case 1: error in user input, but PYTHONSTARTUP is fine
+ startup_code = "print('from pythonstartup')"
+ for repl_name, repl_factory, histfile in self.REPLS:
+ with (
+ self.subTest(repl_name),
+ new_startup_env(code=startup_code, histfile=histfile) as startup_env
+ ):
+ p = repl_factory(env=os.environ | startup_env, isolated=False)
+ p.stdin.write("1/0")
+ output = kill_python(p)
+
+ for expected in (
+ "from pythonstartup",
+ "Traceback (most recent call last):",
+ 'File "<stdin>", line 1, in <module>',
+ "ZeroDivisionError: division by zero",
+ ):
+ self.assertIn(expected, output)
+
+ def test_pythonstartup_failure(self):
+ # case 2: error in PYTHONSTARTUP triggered by user input
+ startup_code = "def foo():\n 1/0\n"
+ for repl_name, repl_factory, histfile in self.REPLS:
+ with (
+ self.subTest(repl_name),
+ new_startup_env(code=startup_code, histfile=histfile) as startup_env
+ ):
+ p = repl_factory(env=os.environ | startup_env, isolated=False)
+ p.stdin.write('foo()')
+ output = kill_python(p)
+
+ for expected in (
+ "Traceback (most recent call last):",
+ 'File "<stdin>", line 1, in <module>',
+ f'File "{startup_env['PYTHONSTARTUP']}", line ',
+ "ZeroDivisionError: division by zero",
+ ):
+ self.assertIn(expected, output)
+
+
 @support.force_not_colorized_test_class
 class TestInteractiveModeSyntaxErrors(unittest.TestCase):
 

Misc/NEWS.d/next/Library/2025-10-18-12-13-39.gh-issue-140287.49iU-4.rst

@@ -0,0 +1,2 @@
+The asyncio REPL now properly handles exceptions in ``PYTHONSTARTUP``
+scripts. Patch by Bartosz Sławecki in :gh:`140287`.