Skip to content

gh-80731: Avoid executing code in except block in cmd #111740

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
serhiy-storchaka merged 4 commits into from
Nov 10, 2023
Merged

gh-80731: Avoid executing code in except block in cmd #111740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc8e2b3
Avoid executing code in except block in cmd
gaogaotiantian Nov 4, 2023
ad01f11
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 4, 2023
23eb43b
Add test in test_cmd as well
gaogaotiantian Nov 6, 2023
fc22b53
Merge branch 'main' into cmd-avoid-exception
serhiy-storchaka Nov 10, 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
5 changes: 2 additions & 3 deletions Lib/cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,8 @@ def onecmd(self, line):
if cmd == '':
return self.default(line)
else:
try:
func = getattr(self, 'do_' + cmd)
except AttributeError:
func = getattr(self, 'do_' + cmd, None)
if func is None:
return self.default(line)
return func(arg)

Expand Down
15 changes: 15 additions & 0 deletions Lib/test/test_cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,21 @@ def test_input_reset_at_EOF(self):
"(Cmd) *** Unknown syntax: EOF\n"))


class CmdPrintExceptionClass(cmd.Cmd):
"""
GH-80731
cmd.Cmd should print the correct exception in default()
>>> mycmd = CmdPrintExceptionClass()
>>> try:
... raise ValueError("test")
... except ValueError:
... mycmd.onecmd("not important")
(<class 'ValueError'>, ValueError('test'))
"""

def default(self, line):
print(sys.exc_info()[:2])

def load_tests(loader, tests, pattern):
tests.addTest(doctest.DocTestSuite())
return tests
Expand Down
25 changes: 25 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 @@ -2349,6 +2349,31 @@ def test_pdb_issue_gh_108976():
(Pdb) continue
"""


def test_pdb_issue_gh_80731():
"""See GH-80731

pdb should correctly print exception info if in an except block.

>>> with PdbTestInput([ # doctest: +ELLIPSIS
... 'import sys',
... 'sys.exc_info()',
... 'continue'
... ]):
... try:
... raise ValueError('Correct')
... except ValueError:
... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
... pass
> <doctest test.test_pdb.test_pdb_issue_gh_80731[0]>(10)<module>()
-> pass
(Pdb) import sys
(Pdb) sys.exc_info()
(<class 'ValueError'>, ValueError('Correct'), <traceback object at ...>)
(Pdb) continue
"""


def test_pdb_ambiguous_statements():
"""See GH-104301

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2023-11-04-21-12-27.gh-issue-80731.Wq51xg.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Avoid executing the default function in :class:`cmd.Cmd` in an except block