Remove the conditional

Author: tanloong

Lib/sqlite3/__main__.py

@@ -132,16 +132,12 @@ def main(*args):
     theme = get_theme()
     s = theme.syntax
 
-    if s.prompt:
-        # Use RL_PROMPT_START_IGNORE (\001) and RL_PROMPT_END_IGNORE (\002) to
-        # bracket non-printing characters. This tells readline to ignore them
-        # when calculating screen space for redisplay during history scrolling.
-        # See https://stackoverflow.com/a/9468954 for more details.
-        sys.ps1 = f"\001{s.prompt}\002sqlite> \001{s.reset}\002"
-        sys.ps2 = f"\001{s.prompt}\002    ... \001{s.reset}\002"
-    else:
-        sys.ps1 = "sqlite> "
-        sys.ps2 = "    ... "
+    # Use RL_PROMPT_START_IGNORE (\001) and RL_PROMPT_END_IGNORE (\002) to
+    # bracket non-printing characters. This tells readline to ignore them
+    # when calculating screen space for redisplay during history scrolling.
+    # See https://stackoverflow.com/a/9468954 for more details.
+    sys.ps1 = f"\001{s.prompt}\002sqlite> \001{s.reset}\002"
+    sys.ps2 = f"\001{s.prompt}\002    ... \001{s.reset}\002"
 
     con = sqlite3.connect(args.filename, isolation_level=None)
     try:

Lib/test/test_sqlite3/test_cli.py

@@ -80,8 +80,8 @@ def test_cli_on_disk_db(self):
 @force_not_colorized_test_class
 class InteractiveSession(unittest.TestCase):
     MEMORY_DB_MSG = "Connected to a transient in-memory database"
-    PS1 = "sqlite> "
-    PS2 = "... "
+    PS1 = "\001\002sqlite> \001\002"
+    PS2 = "\001\002    ... \001\002"
 
     def run_cli(self, *args, commands=()):
         with (
@@ -212,7 +212,7 @@ def test_color(self):
 @requires_subprocess()
 @force_not_colorized_test_class
 class Completion(unittest.TestCase):
-    PS1 = "sqlite> "
+    PS1_NO_COLOR = "sqlite> "
 
     @classmethod
     def setUpClass(cls):
@@ -260,7 +260,7 @@ def test_complete_no_match(self):
         lines = output.decode().splitlines()
         indices = (
             i for i, line in enumerate(lines, 1)
-            if line.startswith(f"{self.PS1}xyzzy")
+            if line.startswith(f"{self.PS1_NO_COLOR}xyzzy")
         )
         line_num = next(indices, -1)
         self.assertNotEqual(line_num, -1)
@@ -296,7 +296,7 @@ def test_complete_no_input(self):
             lines = output.decode().splitlines()
             indices = [
                 i for i, line in enumerate(lines)
-                if line.startswith(self.PS1)
+                if line.startswith(self.PS1_NO_COLOR)
             ]
             self.assertEqual(len(indices), 2)
             start, end = indices