Merge branch 'main' into sqlite3_file_control

Author: qris

Lib/_pyrepl/utils.py

@@ -19,7 +19,21 @@
 from .trace import trace
 
 
-ANSI_ESCAPE_SEQUENCE = re.compile(r"\x1b\[[ -@]*[A-~]")
+ANSI_ESCAPE_SEQUENCE = re.compile(
+    r"""
+    \x1b
+    (?:
+        # CSI: ESC [ followed by parameter/intermediate bytes and a final byte.
+        # For example, ESC [ 31 m ("\x1b[31m") selects red foreground text.
+        \[ [ -@]* [A-~]
+        |
+        # OSC: ESC ] followed by a payload terminated by BEL or ST (ESC \).
+        # For example, ESC ] 0 ; title BEL ("\x1b]0;title\x07") sets the title.
+        \] [^\x1b\x07]* (?: \x07 | \x1b\\ )
+    )
+    """,
+    re.X,
+)
 ZERO_WIDTH_BRACKET = re.compile(r"\x01.*?\x02")
 ZERO_WIDTH_TRANS = str.maketrans({"\x01": "", "\x02": ""})
 IDENTIFIERS_AFTER = frozenset({"def", "class"})

Lib/sqlite3/__main__.py

@@ -15,6 +15,13 @@
 from ._completer import completer
 
 
+# IDLE uses CTRL-D for EOF on all platforms (gh-102628).
+if sys.platform == "win32" and "idlelib.run" not in sys.modules:
+    EOF_KEY = "CTRL-Z"
+else:
+    EOF_KEY = "CTRL-D"
+
+
 def execute(c, sql, suppress_errors=True, theme=theme_no_color):
     """Helper that wraps execution of SQL code.
 
@@ -70,7 +77,7 @@ def runsource(self, source, filename="<input>", symbol="single"):
                     print(f"Enter SQL code or one of the below commands, and press enter.\n\n"
                           f"{t.builtin}.version{t.reset}    Print underlying SQLite library version\n"
                           f"{t.builtin}.help{t.reset}       Print this help message\n"
-                          f"{t.builtin}.quit{t.reset}       Exit the CLI, equivalent to CTRL-D\n")
+                          f"{t.builtin}.quit{t.reset}       Exit the CLI, equivalent to {EOF_KEY}\n")
                 case "quit":
                     sys.exit(0)
                 case "":
@@ -115,16 +122,12 @@ def main(*args):
         db_name = repr(args.filename)
 
     # Prepare REPL banner and prompts.
-    if sys.platform == "win32" and "idlelib.run" not in sys.modules:
-        eofkey = "CTRL-Z"
-    else:
-        eofkey = "CTRL-D"
     banner = dedent(f"""
         sqlite3 shell, running on SQLite version {sqlite3.sqlite_version}
         Connected to {db_name}
 
         Each command will be run using execute() on the cursor.
-        Type ".help" for more information; type ".quit" or {eofkey} to quit.
+        Type ".help" for more information; type ".quit" or {EOF_KEY} to quit.
     """).strip()
 
     theme = get_theme()

Lib/test/test_pyrepl/test_render.py

@@ -55,6 +55,15 @@ def test_from_rendered_text_empty_string(self):
         self.assertEqual(line.text, "")
         self.assertEqual(line.width, 0)
 
+    def test_from_rendered_text_with_osc_control(self):
+        osc = "\x1b]633;A\x1b\\"
+        prompt = ">>> "
+        line = RenderLine.from_rendered_text(osc + prompt)
+
+        self.assertEqual(line.width, len(prompt))
+        self.assertEqual(line.cells[0].controls, (osc,))
+        self.assertEqual(line.cells[0].text, "")
+
     def test_from_rendered_text_with_non_sgr_controls(self):
         # \x1b[H is a cursor-home control (not SGR since it doesn't end with 'm')
         line = RenderLine.from_rendered_text("\x1b[Hx")

Lib/test/test_pyrepl/test_utils.py

@@ -47,6 +47,14 @@ def test_wlen(self):
         self.assertEqual(wlen('e\N{COMBINING ACUTE ACCENT}'), 1)
         self.assertEqual(wlen('a\N{ZERO WIDTH JOINER}b'), 2)
 
+    def test_wlen_with_osc_sequence(self):
+        prompt = ">>> "
+        self.assertEqual(wlen("\x1b]633;A\x07" + prompt), len(prompt))
+
+    def test_wlen_with_unterminated_osc_sequence_as_individual_characters(self):
+        # \x1b is treated as a single character (ESC)
+        self.assertEqual(wlen("\x1b]633;A"), len("\x1b]633;A"))
+
     def test_prev_next_window(self):
         def gen_normal():
             yield 1

Lib/test/test_sqlite3/test_cli.py

@@ -82,6 +82,7 @@ class InteractiveSession(unittest.TestCase):
     MEMORY_DB_MSG = "Connected to a transient in-memory database"
     PS1 = "\001\002sqlite> \001\002"
     PS2 = "\001\002    ... \001\002"
+    EOF_KEY = "CTRL-Z" if sys.platform == "win32" else "CTRL-D"
 
     def run_cli(self, *args, commands=()):
         with (
@@ -104,11 +105,19 @@ def run_cli(self, *args, commands=()):
     def test_interact(self):
         out, err = self.run_cli()
         self.assertIn(self.MEMORY_DB_MSG, err)
-        self.assertIn(self.MEMORY_DB_MSG, err)
+        self.assertIn(f'type ".quit" or {self.EOF_KEY} to quit', err)
         self.assertEndsWith(out, self.PS1)
         self.assertEqual(out.count(self.PS1), 1)
         self.assertEqual(out.count(self.PS2), 0)
 
+    def test_interact_help(self):
+        out, err = self.run_cli(commands=(".help",))
+        self.assertIn(self.MEMORY_DB_MSG, err)
+        self.assertIn(f"Exit the CLI, equivalent to {self.EOF_KEY}", out)
+        self.assertEndsWith(out, self.PS1)
+        self.assertEqual(out.count(self.PS1), 2)
+        self.assertEqual(out.count(self.PS2), 0)
+
     def test_interact_quit(self):
         out, err = self.run_cli(commands=(".quit",))
         self.assertIn(self.MEMORY_DB_MSG, err)

Misc/NEWS.d/next/Library/2025-09-18-18-03-32.gh-issue-139105.1QQ_W4.rst

@@ -0,0 +1 @@
+Correct the EOF key shown in the :mod:`sqlite3` CLI ``.help`` text on Windows.

Misc/NEWS.d/next/Library/2026-09-21-21-07-12.gh-issue-157928.ZPlNYC.rst

@@ -0,0 +1 @@
+Correctly detect and handle OSC sequences in PyREPL.