Skip to content

bpo-41609: Fix output of pdb's whatis command for instance methods #21935

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 2 commits into from
Aug 27, 2020
Merged

bpo-41609: Fix output of pdb's whatis command for instance methods #21935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4592aa4
bpo-41609: Fix output of pdb's whatis command for instance methods
iritkatriel Aug 21, 2020
bb43dcd
📜🤖 Added by blurb_it.
blurb-it[bot] Aug 21, 2020
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
12 changes: 6 additions & 6 deletions Lib/pdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,21 +1312,21 @@ def do_whatis(self, arg):
# _getval() already printed the error
return
code = None
# Is it a function?
# Is it an instance method?
try:
code = value.__code__
code = value.__func__.__code__
except Exception:
pass
if code:
self.message('Function %s' % code.co_name)
self.message('Method %s' % code.co_name)
return
# Is it an instance method?
# Is it a function?
try:
code = value.__func__.__code__
code = value.__code__
except Exception:
pass
if code:
self.message('Method %s' % code.co_name)
self.message('Function %s' % code.co_name)
return
# Is it a class?
if value.__class__ is type:
Expand Down
41 changes: 41 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 @@ -425,6 +425,47 @@ def test_list_commands():
(Pdb) continue
"""

def test_pdb_whatis_command():
"""Test the whatis command

>>> myvar = (1,2)
>>> def myfunc():
... pass

>>> class MyClass:
... def mymethod(self):
... pass

>>> def test_function():
... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()

>>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE
... 'whatis myvar',
... 'whatis myfunc',
... 'whatis MyClass',
... 'whatis MyClass()',
... 'whatis MyClass.mymethod',
... 'whatis MyClass().mymethod',
... 'continue',
... ]):
... test_function()
--Return--
> <doctest test.test_pdb.test_pdb_whatis_command[3]>(2)test_function()->None
-> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
(Pdb) whatis myvar
<class 'tuple'>
(Pdb) whatis myfunc
Function myfunc
(Pdb) whatis MyClass
Class test.test_pdb.MyClass
(Pdb) whatis MyClass()
<class 'test.test_pdb.MyClass'>
(Pdb) whatis MyClass.mymethod
Function mymethod
(Pdb) whatis MyClass().mymethod
Method mymethod
(Pdb) continue
"""

def test_post_mortem():
"""Test post mortem traceback debugging.
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2020-08-21-15-51-15.bpo-41609.JmiUKG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The pdb whatis command correctly reports instance methods as 'Method' rather than 'Function'.