Skip to content

gh-103023: Add SyntaxError check in pdb's display command #103024

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
ambv merged 7 commits into from
Mar 27, 2023
Merged

gh-103023: Add SyntaxError check in pdb's display command #103024

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b362b0
Add syntax error check for display
gaogaotiantian Mar 25, 2023
484b882
Check if any expression is being displayed
gaogaotiantian Mar 25, 2023
52a1cbf
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 25, 2023
a843f97
Use BaseException to catch all exceptions
gaogaotiantian Mar 26, 2023
b736697
Add the syntax error message to output
gaogaotiantian Mar 26, 2023
9a9762a
Update test
gaogaotiantian Mar 26, 2023
c7810ff
Make the news entry more descriptive
ambv Mar 27, 2023
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
Check if any expression is being displayed
  • Loading branch information
@gaogaotiantian
gaogaotiantian committed Mar 25, 2023
commit 484b882ffc05a9828dc5ee20ce060c5a4e587443
9 changes: 6 additions & 3 deletions Lib/pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,9 +1436,12 @@ def do_display(self, arg):
Without expression, list all display expressions for the current frame.
"""
if not arg:
self.message('Currently displaying:')
for item in self.displaying.get(self.curframe, {}).items():
self.message('%s: %r' % item)
if self.displaying:
self.message('Currently displaying:')
for item in self.displaying.get(self.curframe, {}).items():
self.message('%s: %r' % item)
else:
self.message('No expression is being displayed')
else:
val, exc = self._getval_except(arg)
if isinstance(exc, SyntaxError):
Expand Down
3 changes: 3 additions & 0 deletions Lib/test/test_pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@ def test_pdb_display_command():

>>> with PdbTestInput([ # doctest: +ELLIPSIS
... 'display +',
... 'display',
... 'display a',
... 'n',
... 'display',
Expand All @@ -603,6 +604,8 @@ def test_pdb_display_command():
-> a = 1
(Pdb) display +
Unable to display "+": SyntaxError
(Pdb) display
No expression is being displayed
(Pdb) display a
display a: 0
(Pdb) n
Expand Down