[Python-checkins] bpo-36969: Make PDB args command display keyword only arguments (GH-13452)
Pablo Galindo
webhook-mailer at python.org
Mon May 20 18:17:33 EDT 2019
https://github.com/python/cpython/commit/bf457c7d8224179a023957876e757f2a7ffc3d9d
commit: bf457c7d8224179a023957876e757f2a7ffc3d9d
branch: master
author: Rémi Lapeyre <remi.lapeyre at henki.fr>
committer: Pablo Galindo <Pablogsal at gmail.com>
date: 2019-05-20T23:17:30+01:00
summary:
bpo-36969: Make PDB args command display keyword only arguments (GH-13452)
files:
A Misc/NEWS.d/next/Library/2019-05-20-23-31-20.bpo-36969.JkZORP.rst
M Lib/pdb.py
M Lib/test/test_pdb.py
diff --git a/Lib/pdb.py b/Lib/pdb.py
index f5d33c27fc1d..0e7609e43d4e 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -1132,9 +1132,9 @@ def do_args(self, arg):
"""
co = self.curframe.f_code
dict = self.curframe_locals
- n = co.co_argcount
- if co.co_flags & 4: n = n+1
- if co.co_flags & 8: n = n+1
+ n = co.co_argcount + co.co_kwonlyargcount
+ if co.co_flags & inspect.CO_VARARGS: n = n+1
+ if co.co_flags & inspect.CO_VARKEYWORDS: n = n+1
for i in range(n):
name = co.co_varnames[i]
if name in dict:
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 56d823249544..a33494d6d878 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -77,9 +77,13 @@ def test_pdb_basic_commands():
... print('...')
... return foo.upper()
+ >>> def test_function3(arg=None, *, kwonly=None):
+ ... pass
+
>>> def test_function():
... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
... ret = test_function_2('baz')
+ ... test_function3(kwonly=True)
... print(ret)
>>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE
@@ -97,10 +101,13 @@ def test_pdb_basic_commands():
... 'jump 8', # jump over second for loop
... 'return', # return out of function
... 'retval', # display return value
+ ... 'next', # step to test_function3()
+ ... 'step', # stepping into test_function3()
+ ... 'args', # display function args
... 'continue',
... ]):
... test_function()
- > <doctest test.test_pdb.test_pdb_basic_commands[1]>(3)test_function()
+ > <doctest test.test_pdb.test_pdb_basic_commands[2]>(3)test_function()
-> ret = test_function_2('baz')
(Pdb) step
--Call--
@@ -123,14 +130,14 @@ def test_pdb_basic_commands():
[EOF]
(Pdb) bt
...
- <doctest test.test_pdb.test_pdb_basic_commands[2]>(18)<module>()
+ <doctest test.test_pdb.test_pdb_basic_commands[3]>(21)<module>()
-> test_function()
- <doctest test.test_pdb.test_pdb_basic_commands[1]>(3)test_function()
+ <doctest test.test_pdb.test_pdb_basic_commands[2]>(3)test_function()
-> ret = test_function_2('baz')
> <doctest test.test_pdb.test_pdb_basic_commands[0]>(1)test_function_2()
-> def test_function_2(foo, bar='default'):
(Pdb) up
- > <doctest test.test_pdb.test_pdb_basic_commands[1]>(3)test_function()
+ > <doctest test.test_pdb.test_pdb_basic_commands[2]>(3)test_function()
-> ret = test_function_2('baz')
(Pdb) down
> <doctest test.test_pdb.test_pdb_basic_commands[0]>(1)test_function_2()
@@ -168,6 +175,16 @@ def test_pdb_basic_commands():
-> return foo.upper()
(Pdb) retval
'BAZ'
+ (Pdb) next
+ > <doctest test.test_pdb.test_pdb_basic_commands[2]>(4)test_function()
+ -> test_function3(kwonly=True)
+ (Pdb) step
+ --Call--
+ > <doctest test.test_pdb.test_pdb_basic_commands[1]>(1)test_function3()
+ -> def test_function3(arg=None, *, kwonly=None):
+ (Pdb) args
+ arg = None
+ kwonly = True
(Pdb) continue
BAZ
"""
diff --git a/Misc/NEWS.d/next/Library/2019-05-20-23-31-20.bpo-36969.JkZORP.rst b/Misc/NEWS.d/next/Library/2019-05-20-23-31-20.bpo-36969.JkZORP.rst
new file mode 100644
index 000000000000..9253ab92f1fb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-05-20-23-31-20.bpo-36969.JkZORP.rst
@@ -0,0 +1,2 @@
+PDB command `args` now display keyword only arguments. Patch contributed by
+Rémi Lapeyre.
More information about the Python-checkins
mailing list