Simplify everything

StanFromIreland · StanFromIreland · commit 158c50c51aad · 2025-05-06T19:27:09.000+01:00
diff --git a/Lib/sqlite3/__main__.py b/Lib/sqlite3/__main__.py
@@ -12,12 +12,8 @@
 from textwrap import dedent
 import _colorize as colorize
 
-def _clr(color, use_color):
-    if use_color:
-        return color
-    return ''
 
-def execute(c, sql, suppress_errors=True, use_color=False):
+def execute(c, sql, suppress_errors=True):
     """Helper that wraps execution of SQL code.
 
     This is used both by the REPL and by direct execution from the CLI.
@@ -33,24 +29,23 @@ def execute(c, sql, suppress_errors=True, use_color=False):
         theme = colorize.get_theme(force_color=True).traceback
         tp = type(e).__name__
         try:
-            print(f"{_clr(theme.type, use_color)}{tp} ({e.sqlite_errorname})"
-                  f"{_clr(theme.reset, use_color)}: "
-                  f"{_clr(theme.message, use_color)}{e}{_clr(theme.reset, use_color)}", file=sys.stderr)
+            print(f"{theme.type}{tp} ({e.sqlite_errorname})"
+                  f"{theme.reset}: "
+                  f"{theme.message}{e}{theme.reset}", file=sys.stderr)
         except AttributeError:
-            print(f"{_clr(theme.type, use_color)}{tp}{_clr(theme.reset, use_color)}: "
-                  f"{_clr(theme.message, use_color)}{e}{_clr(theme.reset, use_color)}", file=sys.stderr)
+            print(f"{theme.type}{tp}{theme.reset}: "
+                  f"{theme.message}{e}{theme.reset}", file=sys.stderr)
         if not suppress_errors:
             sys.exit(1)
 
 
 class SqliteInteractiveConsole(InteractiveConsole):
     """A simple SQLite REPL."""
 
-    def __init__(self, connection, use_color=False):
+    def __init__(self, connection):
         super().__init__()
         self._con = connection
         self._cur = connection.cursor()
-        self._use_color = use_color
 
     def runsource(self, source, filename="<input>", symbol="single"):
         """Override runsource, the core of the InteractiveConsole REPL.
@@ -68,7 +63,7 @@ def runsource(self, source, filename="<input>", symbol="single"):
             case _:
                 if not sqlite3.complete_statement(source):
                     return True
-                execute(self._cur, source, use_color=self._use_color)
+                execute(self._cur, source)
         return False
 
 
@@ -116,11 +111,10 @@ def main(*args):
         Type ".help" for more information; type ".quit" or {eofkey} to quit.
     """).strip()
 
-    use_color = colorize.can_colorize()
     theme = colorize.get_theme(force_color=True).syntax
 
-    sys.ps1 = f"{_clr(theme.prompt, use_color)}sqlite> {_clr(theme.reset, use_color)}"
-    sys.ps2 = f"{_clr(theme.prompt, use_color)}    ... {_clr(theme.reset, use_color)}"
+    sys.ps1 = f"{theme.prompt}sqlite> {theme.reset}"
+    sys.ps2 = f"{theme.prompt}    ... {theme.reset}"
 
     con = sqlite3.connect(args.filename, isolation_level=None)
     try:
@@ -129,7 +123,7 @@ def main(*args):
             execute(con, args.sql, suppress_errors=False)
         else:
             # No SQL provided; start the REPL.
-            console = SqliteInteractiveConsole(con, use_color)
+            console = SqliteInteractiveConsole(con)
             try:
                 import readline  # noqa: F401
             except ImportError:
