https://github.com/python/cpython/commit/eafd633fac0c25ffdb98ffee31184eb3b4ca8b88
commit: eafd633fac0c25ffdb98ffee31184eb3b4ca8b88
branch: 3.13
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: lysnikolaou <lisandros...@gmail.com>
date: 2024-05-22T16:07:38Z
summary:
[3.13] gh-119205: Fix autocompletion bug in new repl (GH-119229) (#119407)
(cherry picked from commit 506b1a3ff66a41c72d205c8e4cba574e439d8e76)
Co-authored-by: Koudai Aono <koxud...@gmail.com>
Co-authored-by: Łukasz Langa <luk...@langa.pl>
files:
M Lib/_pyrepl/readline.py
M Lib/test/test_pyrepl/test_pyrepl.py
M Lib/test/test_pyrepl/test_unix_eventqueue.py
diff --git a/Lib/_pyrepl/readline.py b/Lib/_pyrepl/readline.py
index 8de60ffd2bd025e..e3444d90477d352 100644
--- a/Lib/_pyrepl/readline.py
+++ b/Lib/_pyrepl/readline.py
@@ -28,6 +28,7 @@
from __future__ import annotations
+import warnings
from dataclasses import dataclass, field
import os
@@ -298,7 +299,8 @@ def multiline_input(self, more_lines, ps1, ps2):
reader.more_lines = more_lines
reader.ps1 = reader.ps2 = ps1
reader.ps3 = reader.ps4 = ps2
- return reader.readline(), reader.was_paste_mode_activated
+ with warnings.catch_warnings(action="ignore"):
+ return reader.readline(), reader.was_paste_mode_activated
finally:
reader.more_lines = saved
reader.paste_mode = False
diff --git a/Lib/test/test_pyrepl/test_pyrepl.py
b/Lib/test/test_pyrepl/test_pyrepl.py
index bc0a9975e34e008..b643ae5895c97e8 100644
--- a/Lib/test/test_pyrepl/test_pyrepl.py
+++ b/Lib/test/test_pyrepl/test_pyrepl.py
@@ -1,12 +1,15 @@
import itertools
+import io
import os
import rlcompleter
-import unittest
from unittest import TestCase
+from unittest.mock import patch
-from .support import FakeConsole, handle_all_events,
handle_events_narrow_console, multiline_input, code_to_events
+from .support import FakeConsole, handle_all_events,
handle_events_narrow_console
+from .support import more_lines, multiline_input, code_to_events
from _pyrepl.console import Event
from _pyrepl.readline import ReadlineAlikeReader, ReadlineConfig
+from _pyrepl.readline import multiline_input as readline_multiline_input
class TestCursorPosition(TestCase):
@@ -475,6 +478,25 @@ def test_updown_arrow_with_completion_menu(self):
output = multiline_input(reader, namespace)
self.assertEqual(output, "os.")
+ @patch("_pyrepl.readline._ReadlineWrapper.get_reader")
+ @patch("sys.stderr", new_callable=io.StringIO)
+ def test_completion_with_warnings(self, mock_stderr, mock_get_reader):
+ class Dummy:
+ @property
+ def test_func(self):
+ import warnings
+ warnings.warn("warnings\n")
+ return None
+
+ dummy = Dummy()
+ events = code_to_events("dummy.test_func.\t\n\n")
+ namespace = {"dummy": dummy}
+ reader = self.prepare_reader(events, namespace)
+ mock_get_reader.return_value = reader
+ output = readline_multiline_input(more_lines, ">>>", "...")
+ self.assertEqual(output[0], "dummy.test_func.__")
+ self.assertEqual(mock_stderr.getvalue(), "")
+
class TestPasteEvent(TestCase):
def prepare_reader(self, events):
@@ -633,7 +655,3 @@ def test_bracketed_paste_single_line(self):
reader = self.prepare_reader(events)
output = multiline_input(reader)
self.assertEqual(output, input_code)
-
-
-if __name__ == "__main__":
- unittest.main()
diff --git a/Lib/test/test_pyrepl/test_unix_eventqueue.py
b/Lib/test/test_pyrepl/test_unix_eventqueue.py
index be2bc00e5692a7b..c06536b4a86a04a 100644
--- a/Lib/test/test_pyrepl/test_unix_eventqueue.py
+++ b/Lib/test/test_pyrepl/test_unix_eventqueue.py
@@ -7,7 +7,7 @@
@patch("_pyrepl.curses.tigetstr", lambda x: b"")
-class TestUnivEventQueue(unittest.TestCase):
+class TestUnixEventQueue(unittest.TestCase):
def setUp(self):
self.file = tempfile.TemporaryFile()
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
