Skip to content

[3.13] Revert "gh-128231: Use runcode() return value for failing early (GH-129488) (#130513)" #131834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions Lib/_pyrepl/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ def repaint(self) -> None: ...


class InteractiveColoredConsole(code.InteractiveConsole):
STATEMENT_FAILED = object()

def __init__(
self,
locals: dict[str, object] | None = None,
Expand All @@ -176,16 +174,6 @@ def _excepthook(self, typ, value, tb):
limit=traceback.BUILTIN_EXCEPTION_LIMIT)
self.write(''.join(lines))

def runcode(self, code):
try:
exec(code, self.locals)
except SystemExit:
raise
except BaseException:
self.showtraceback()
return self.STATEMENT_FAILED
return None

def runsource(self, source, filename="<input>", symbol="single"):
try:
tree = self.compile.compiler(
Expand Down Expand Up @@ -223,7 +211,5 @@ def runsource(self, source, filename="<input>", symbol="single"):
if code is None:
return True

result = self.runcode(code)
if result is self.STATEMENT_FAILED:
break
self.runcode(code)
return False
2 changes: 1 addition & 1 deletion Lib/asyncio/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def callback():
self.write("\nKeyboardInterrupt\n")
else:
self.showtraceback()
return self.STATEMENT_FAILED


class REPLThread(threading.Thread):

Expand Down
13 changes: 0 additions & 13 deletions Lib/test/test_pyrepl/test_interact.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,6 @@ def test_multiple_statements_output(self):
self.assertFalse(more)
self.assertEqual(f.getvalue(), "1\n")

@force_not_colorized
def test_multiple_statements_fail_early(self):
console = InteractiveColoredConsole()
code = dedent("""\
raise Exception('foobar')
print('spam&eggs')
""")
f = io.StringIO()
with contextlib.redirect_stderr(f):
console.runsource(code)
self.assertIn('Exception: foobar', f.getvalue())
self.assertNotIn('spam&eggs', f.getvalue())

def test_empty(self):
namespace = {}
code = ""
Expand Down
10 changes: 1 addition & 9 deletions Lib/test/test_repl.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,7 @@ def f():
self.assertEqual(traceback_lines, expected_lines)


class TestAsyncioREPL(unittest.TestCase):
def test_multiple_statements_fail_early(self):
user_input = "1 / 0; print('afterwards')"
p = spawn_repl("-m", "asyncio")
p.stdin.write(user_input)
output = kill_python(p)
self.assertIn("ZeroDivisionError", output)
self.assertNotIn("afterwards", output)

class TestAsyncioREPLContextVars(unittest.TestCase):
def test_toplevel_contextvars_sync(self):
user_input = dedent("""\
from contextvars import ContextVar
Expand Down

This file was deleted.

Loading