mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.13] gh-119469: Fix _pyrepl reference leaks (GH-119470) (#119471)

Browse source 
(cherry picked from commit 6e012ced6c)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
This commit is contained in:
Miss Islington (bot) 2024-05-23 19:58:59 +02:00 • committed by GitHub
parent 251ef2e36f
commit 8fd8cc564b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_pyrepl/test_interact.py
View file

@ -27,9 +27,11 @@ class TestSimpleInteract(unittest.TestCase):
a a
""") """)
console = InteractiveColoredConsole(namespace, filename="<stdin>") console = InteractiveColoredConsole(namespace, filename="<stdin>")
f = io.StringIO()
with ( with (
patch.object(InteractiveColoredConsole, "showsyntaxerror") as showsyntaxerror, patch.object(InteractiveColoredConsole, "showsyntaxerror") as showsyntaxerror,
patch.object(InteractiveColoredConsole, "runsource", wraps=console.runsource) as runsource, patch.object(InteractiveColoredConsole, "runsource", wraps=console.runsource) as runsource,
contextlib.redirect_stdout(f),
): ):
more = console.push(code, filename="<stdin>", _symbol="single") # type: ignore[call-arg] more = console.push(code, filename="<stdin>", _symbol="single") # type: ignore[call-arg]
self.assertFalse(more) self.assertFalse(more)
@ -71,7 +73,9 @@ class TestSimpleInteract(unittest.TestCase):
def test_runsource_returns_false_for_successful_compilation(self): def test_runsource_returns_false_for_successful_compilation(self):
console = InteractiveColoredConsole() console = InteractiveColoredConsole()
source = "print('Hello, world!')" source = "print('Hello, world!')"
result = console.runsource(source) f = io.StringIO()
with contextlib.redirect_stdout(f):
result = console.runsource(source)
self.assertFalse(result) self.assertFalse(result)
@force_not_colorized @force_not_colorized

36
Lib/test/test_pyrepl/test_unix_console.py
View file

@ -112,17 +112,18 @@ class TestConsole(TestCase):
def test_simple_addition(self, _os_write): def test_simple_addition(self, _os_write):
code = "12+34" code = "12+34"
events = code_to_events(code) events = code_to_events(code)
_, _ = handle_events_unix_console(events) _, con = handle_events_unix_console(events)
_os_write.assert_any_call(ANY, b"1") _os_write.assert_any_call(ANY, b"1")
_os_write.assert_any_call(ANY, b"2") _os_write.assert_any_call(ANY, b"2")
_os_write.assert_any_call(ANY, b"+") _os_write.assert_any_call(ANY, b"+")
_os_write.assert_any_call(ANY, b"3") _os_write.assert_any_call(ANY, b"3")
_os_write.assert_any_call(ANY, b"4") _os_write.assert_any_call(ANY, b"4")
con.restore()
def test_wrap(self, _os_write): def test_wrap(self, _os_write):
code = "12+34" code = "12+34"
events = code_to_events(code) events = code_to_events(code)
_, _ = handle_events_narrow_unix_console(events) _, con = handle_events_narrow_unix_console(events)
_os_write.assert_any_call(ANY, b"1") _os_write.assert_any_call(ANY, b"1")
_os_write.assert_any_call(ANY, b"2") _os_write.assert_any_call(ANY, b"2")
_os_write.assert_any_call(ANY, b"+") _os_write.assert_any_call(ANY, b"+")
@ -130,6 +131,8 @@ class TestConsole(TestCase):
_os_write.assert_any_call(ANY, b"\\") _os_write.assert_any_call(ANY, b"\\")
_os_write.assert_any_call(ANY, b"\n") _os_write.assert_any_call(ANY, b"\n")
_os_write.assert_any_call(ANY, b"4") _os_write.assert_any_call(ANY, b"4")
con.restore()
def test_cursor_left(self, _os_write): def test_cursor_left(self, _os_write):
code = "1" code = "1"
@ -137,8 +140,9 @@ class TestConsole(TestCase):
code_to_events(code), code_to_events(code),
[Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))], [Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))],
) )
_, _ = handle_events_unix_console(events) _, con = handle_events_unix_console(events)
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["cub"] + b":1") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cub"] + b":1")
con.restore()
def test_cursor_left_right(self, _os_write): def test_cursor_left_right(self, _os_write):
code = "1" code = "1"
@ -149,9 +153,10 @@ class TestConsole(TestCase):
Event(evt="key", data="right", raw=bytearray(b"\x1bOC")), Event(evt="key", data="right", raw=bytearray(b"\x1bOC")),
], ],
) )
_, _ = handle_events_unix_console(events) _, con = handle_events_unix_console(events)
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["cub"] + b":1") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cub"] + b":1")
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["cuf"] + b":1") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cuf"] + b":1")
con.restore()
def test_cursor_up(self, _os_write): def test_cursor_up(self, _os_write):
code = "1\n2+3" code = "1\n2+3"
@ -159,8 +164,9 @@ class TestConsole(TestCase):
code_to_events(code), code_to_events(code),
[Event(evt="key", data="up", raw=bytearray(b"\x1bOA"))], [Event(evt="key", data="up", raw=bytearray(b"\x1bOA"))],
) )
_, _ = handle_events_unix_console(events) _, con = handle_events_unix_console(events)
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["cuu"] + b":1") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cuu"] + b":1")
con.restore()
def test_cursor_up_down(self, _os_write): def test_cursor_up_down(self, _os_write):
code = "1\n2+3" code = "1\n2+3"
@ -171,9 +177,10 @@ class TestConsole(TestCase):
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
], ],
) )
_, _ = handle_events_unix_console(events) _, con = handle_events_unix_console(events)
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["cuu"] + b":1") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cuu"] + b":1")
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["cud"] + b":1") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cud"] + b":1")
con.restore()
def test_cursor_back_write(self, _os_write): def test_cursor_back_write(self, _os_write):
events = itertools.chain( events = itertools.chain(
@ -181,10 +188,11 @@ class TestConsole(TestCase):
[Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))], [Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))],
code_to_events("2"), code_to_events("2"),
) )
_, _ = handle_events_unix_console(events) _, con = handle_events_unix_console(events)
_os_write.assert_any_call(ANY, b"1") _os_write.assert_any_call(ANY, b"1")
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["cub"] + b":1") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cub"] + b":1")
_os_write.assert_any_call(ANY, b"2") _os_write.assert_any_call(ANY, b"2")
con.restore()
def test_multiline_function_move_up_short_terminal(self, _os_write): def test_multiline_function_move_up_short_terminal(self, _os_write):
# fmt: off # fmt: off
@ -201,8 +209,9 @@ class TestConsole(TestCase):
Event(evt="scroll", data=None), Event(evt="scroll", data=None),
], ],
) )
_, _ = handle_events_short_unix_console(events) _, con = handle_events_short_unix_console(events)
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["ri"] + b":") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["ri"] + b":")
con.restore()
def test_multiline_function_move_up_down_short_terminal(self, _os_write): def test_multiline_function_move_up_down_short_terminal(self, _os_write):
# fmt: off # fmt: off
@ -221,9 +230,10 @@ class TestConsole(TestCase):
Event(evt="scroll", data=None), Event(evt="scroll", data=None),
], ],
) )
_, _ = handle_events_short_unix_console(events) _, con = handle_events_short_unix_console(events)
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["ri"] + b":") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["ri"] + b":")
_os_write.assert_any_call(ANY, TERM_CAPABILITIES["ind"] + b":") _os_write.assert_any_call(ANY, TERM_CAPABILITIES["ind"] + b":")
con.restore()
def test_resize_bigger_on_multiline_function(self, _os_write): def test_resize_bigger_on_multiline_function(self, _os_write):
# fmt: off # fmt: off
@ -246,7 +256,7 @@ class TestConsole(TestCase):
console.get_event = MagicMock(side_effect=events) console.get_event = MagicMock(side_effect=events)
return console return console
_, _ = handle_all_events( _, con = handle_all_events(
[Event(evt="resize", data=None)], [Event(evt="resize", data=None)],
prepare_reader=same_reader, prepare_reader=same_reader,
prepare_console=same_console, prepare_console=same_console,
@ -258,6 +268,8 @@ class TestConsole(TestCase):
call(ANY, b"def f():"), call(ANY, b"def f():"),
] ]
) )
console.restore()
con.restore()
def test_resize_smaller_on_multiline_function(self, _os_write): def test_resize_smaller_on_multiline_function(self, _os_write):
# fmt: off # fmt: off
@ -280,7 +292,7 @@ class TestConsole(TestCase):
console.get_event = MagicMock(side_effect=events) console.get_event = MagicMock(side_effect=events)
return console return console
_, _ = handle_all_events( _, con = handle_all_events(
[Event(evt="resize", data=None)], [Event(evt="resize", data=None)],
prepare_reader=same_reader, prepare_reader=same_reader,
prepare_console=same_console, prepare_console=same_console,
@ -292,3 +304,5 @@ class TestConsole(TestCase):
call(ANY, b" foo"), call(ANY, b" foo"),
] ]
) )
console.restore()
con.restore()