8000 gh-133439: Fix the error message in the sqlite3 CLI by StanFromIreland · Pull Request #133807 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-133439: Fix the error message in the sqlite3 CLI #133807

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 10 commits into from
Jun 19, 2025
Merged

gh-133439: Fix the error message in the sqlite3 CLI #133807

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6b59a0b
Fixup pr
StanFromIreland May 10, 2025
6980619
Merge branch 'main' into sqlite3-fixup
StanFromIreland May 10, 2025
6cb0432
Benedikts suggestion
StanFromIreland May 10, 2025
1c6cf80
Update Lib/sqlite3/__main__.py
StanFromIreland May 10, 2025
97d002d
Use rstrip
StanFromIreland Jun 13, 2025
c2ed7f1
Adding the test file would be a good idea
StanFromIreland Jun 13, 2025
7170ad9
Revert "Use rstrip"
StanFromIreland Jun 13, 2025
fed7c0a
Revert "Adding the test file would be a good idea"
StanFromIreland Jun 13, 2025
e8fde8d
Apply suggestions from code review
serhiy-storchaka Jun 14, 2025
4dcd379
Update Lib/test/test_sqlite3/test_cli.py
serhiy-storchaka Jun 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
8000 Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into sqlite3-fixup
  • Loading branch information
@StanFromIreland
StanFromIreland authored May 10, 2025
commit 69806198372abed2806d3d6bb672f26d9371f91d
5 changes: 3 additions & 2 deletions Lib/sqlite3/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ def runsource(self, source, filename="<input>", symbol="single"):
case "":
pass
case _ as unknown:
print("Error: unknown command or invalid arguments:"
f' "{unknown}"', file=sys.stderr)
t = theme.traceback
print(f'{t.type}Error{t.reset}:{t.message} unknown command '
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that the banner and tracebacks are written using self.write(). Why not use it here for consistence?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errors (35) use print? And so do the other match statements branches.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other branches output to stdout.

Line 35 perhaps should use self.write() too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can leave execute() for now. It is not worth to rewrite it just for this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
print(f'{t.type}Error{t.reset}:{t.message} unknown command '
self.write(f'{t.type}Error{t.reset}:{t.message} unknown command '

It is up to you/Erlend. The box to allow you to commit was checked.

f'or invalid arguments: "{unknown}"{t.reset}', file=sys.stderr)
else:
if not sqlite3.complete_statement(source):
return True
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.
0