8000 gh-133447: Add basic color to `sqlite3` CLI by StanFromIreland · Pull Request #133461 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-133447: Add basic color to sqlite3 CLI #133461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 10, 2025
Merged

gh-133447: Add basic color to sqlite3 CLI #133461

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0a33388
Add
StanFromIreland May 5, 2025
e680c35
Import cleanup
StanFromIreland May 5, 2025
9bf179c
Merge branch 'main' into color_step1
StanFromIreland May 5, 2025
b456133
Highlight error messages
StanFromIreland May 5, 2025
8ef9217
Merge branch 'main' into color_step1
StanFromIreland May 6, 2025
ca015a1
Now with themes!
StanFromIreland May 6, 2025
2c06076
Simpler usage
StanFromIreland May 6, 2025
198399e
Fixup
StanFromIreland May 6, 2025
2a8c729
Simplify
ambv May 6, 2025
a220442
Don't skip coloring errors on single-statement execution
ambv May 6, 2025
e65d724
Also ignore color in the CLI test case
ambv May 6, 2025
66711a0
Clean up
StanFromIreland May 6, 2025
62a0164
Fix line removal
StanFromIreland May 7, 2025
52ee84c
Merge branch 'main' into color_step1
StanFromIreland May 9, 2025
4ed5815
Lint
StanFromIreland May 9, 2025
4c0b52c
fixup! Lint
StanFromIreland May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Now with themes!
  • Loading branch information
@StanFromIreland
StanFromIreland committed May 6, 2025
commit ca015a1c9b87a477e450cc1ec7b95e30018e0ab7
20 changes: 10 additions & 10 deletions Lib/sqlite3/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
from textwrap import dedent
import _colorize as colorize

BOLD_MAGENTA = colorize.ANSIColors.BOLD_MAGENTA
MAGENTA =colorize.ANSIColors.MAGENTA
SYNTAX = colorize.Syntax
TRACEBACK=colorize.Traceback
RESET = colorize.ANSIColors.RESET

def color(color, use_color):
def _clr(color, use_color):
if use_color:
return color
return ''
Expand All @@ -36,12 +36,12 @@ def execute(c, sql, suppress_errors=True, use_color=False):
except sqlite3.Error as e:
tp = type(e).__name__
try:
print(f"{color(BOLD_MAGENTA, use_color)}{tp} ({e.sqlite_errorname})"
f"{color(RESET, use_color)}: "
f"{color(MAGENTA, use_color)}{e}{color(RESET, use_color)}", file=sys.stderr)
print(f"{_clr(TRACEBACK.type, use_color)}{tp} ({e.sqlite_errorname})"
f"{_clr(RESET, use_color)}: "
f"{_clr(TRACEBACK.message, use_color)}{e}{_clr(RESET, use_color)}", file=sys.stderr)
except AttributeError:
print(f"{color(BOLD_MAGENTA, use_color)}{tp}{color(RESET, use_color)}: "
f"{color(MAGENTA, use_color)}{e}{color(RESET, use_color)}", file=sys.stderr)
print(f"{_clr(TRACEBACK.type, use_color)}{tp}{_clr(RESET, use_color)}: "
f"{_clr(TRACEBACK.message, use_color)}{e}{_clr(RESET, use_color)}", file=sys.stderr)
if not suppress_errors:
sys.exit(1)

Expand Down Expand Up @@ -121,8 +121,8 @@ def main(*args):

use_color = colorize.can_colorize()

sys.ps1 = f"{color(BOLD_MAGENTA, use_color)}sqlite> {color(RESET, use_color)}"
sys.ps2 = f"{color(BOLD_MAGENTA, use_color)} ... {color(RESET, use_color)}"
sys.ps1 = f"{_clr(SYNTAX.prompt, use_color)}sqlite> {_clr(RESET, use_color)}"
sys.ps2 = f"{_clr(SYNTAX.prompt, use_color)} ... {_clr(RESET, use_color)}"

con = sqlite3.connect(args.filename, isolation_level=None)
try:
Expand Down
Loading
0