https://github.com/python/cpython/commit/8f2c0f7a03b71485b5635cb47c000e4e8ace8800
commit: 8f2c0f7a03b71485b5635cb47c000e4e8ace8800
branch: main
author: Tian Gao <[email protected]>
committer: gaogaotiantian <[email protected]>
date: 2024-10-23T18:04:30-04:00
summary:
gh-125884: Support breakpoint on functions with annotations (#125892)
files:
A Misc/NEWS.d/next/Library/2024-10-23-17-45-40.gh-issue-125884.41E_PD.rst
M Lib/pdb.py
M Lib/test/test_pdb.py
diff --git a/Lib/pdb.py b/Lib/pdb.py
index 832213abbb98e6..3c0cbb525e28ef 100644
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -118,7 +118,7 @@ def find_first_executable_line(code):
return code.co_firstlineno
def find_function(funcname, filename):
- cre = re.compile(r'def\s+%s\s*[(]' % re.escape(funcname))
+ cre = re.compile(r'def\s+%s(\s*\[.+\])?\s*[(]' % re.escape(funcname))
try:
fp = tokenize.open(filename)
except OSError:
@@ -138,9 +138,12 @@ def find_function(funcname, filename):
if funcdef:
try:
- funccode = compile(funcdef, filename, 'exec').co_consts[0]
+ code = compile(funcdef, filename, 'exec')
except SyntaxError:
continue
+ # We should always be able to find the code object here
+ funccode = next(c for c in code.co_consts if
+ isinstance(c, CodeType) and c.co_name ==
funcname)
lineno_offset = find_first_executable_line(funccode)
return funcname, filename, funcstart + lineno_offset - 1
return None
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 1ea93ed037005d..e5f9848319021a 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -363,6 +363,42 @@ def test_pdb_breakpoint_commands():
4
"""
+def test_pdb_breakpoint_on_annotated_function_def():
+ """Test breakpoints on function definitions with annotation.
+
+ >>> def foo[T]():
+ ... return 0
+
+ >>> def bar() -> int:
+ ... return 0
+
+ >>> def foobar[T]() -> int:
+ ... return 0
+
+ >>> reset_Breakpoint()
+
+ >>> def test_function():
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ ... pass
+
+ >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
+ ... 'break foo',
+ ... 'break bar',
+ ... 'break foobar',
+ ... 'continue',
+ ... ]):
+ ... test_function()
+ > <doctest
test.test_pdb.test_pdb_breakpoint_on_annotated_function_def[4]>(2)test_function()
+ -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ (Pdb) break foo
+ Breakpoint 1 at <doctest
test.test_pdb.test_pdb_breakpoint_on_annotated_function_def[0]>:2
+ (Pdb) break bar
+ Breakpoint 2 at <doctest
test.test_pdb.test_pdb_breakpoint_on_annotated_function_def[1]>:2
+ (Pdb) break foobar
+ Breakpoint 3 at <doctest
test.test_pdb.test_pdb_breakpoint_on_annotated_function_def[2]>:2
+ (Pdb) continue
+ """
+
def test_pdb_commands():
"""Test the commands command of pdb.
diff --git
a/Misc/NEWS.d/next/Library/2024-10-23-17-45-40.gh-issue-125884.41E_PD.rst
b/Misc/NEWS.d/next/Library/2024-10-23-17-45-40.gh-issue-125884.41E_PD.rst
new file mode 100644
index 00000000000000..684b1f282b143e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-10-23-17-45-40.gh-issue-125884.41E_PD.rst
@@ -0,0 +1 @@
+Fixed the bug for :mod:`pdb` where it can't set breakpoints on functions with
certain annotations.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
