https://github.com/python/cpython/commit/1bc4f076d193ad157bdc69a1d62685a15f95113f
commit: 1bc4f076d193ad157bdc69a1d62685a15f95113f
branch: main
author: Tian Gao <[email protected]>
committer: gaogaotiantian <[email protected]>
date: 2024-12-01T11:57:03-05:00
summary:
gh-127321: Avoid stopping at an opcode without an associated line number for
breakpoint() (#127457)
files:
A Misc/NEWS.d/next/Library/2024-11-30-21-46-15.gh-issue-127321.M78fBv.rst
M Lib/pdb.py
M Lib/test/test_pdb.py
diff --git a/Lib/pdb.py b/Lib/pdb.py
index b7f6fd4323407e..10d1923cdad2d6 100644
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -438,6 +438,13 @@ def user_line(self, frame):
if (self.mainpyfile != self.canonic(frame.f_code.co_filename)):
return
self._wait_for_mainpyfile = False
+ if self.trace_opcodes:
+ # GH-127321
+ # We want to avoid stopping at an opcode that does not have
+ # an associated line number because pdb does not like it
+ if frame.f_lineno is None:
+ self.set_stepinstr()
+ return
self.bp_commands(frame)
self.interaction(frame, None)
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index e5f9848319021a..48a4c568651879 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -2931,6 +2931,22 @@ def test_pdb_issue_gh_108976():
(Pdb) continue
"""
+def test_pdb_issue_gh_127321():
+ """See GH-127321
+ breakpoint() should stop at a opcode that has a line number
+ >>> def test_function():
+ ... import pdb; pdb_instance = pdb.Pdb(nosigint=True, readrc=False)
+ ... [1, 2] and pdb_instance.set_trace()
+ ... a = 1
+ >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
+ ... 'continue'
+ ... ]):
+ ... test_function()
+ > <doctest test.test_pdb.test_pdb_issue_gh_127321[0]>(4)test_function()
+ -> a = 1
+ (Pdb) continue
+ """
+
def test_pdb_issue_gh_80731():
"""See GH-80731
diff --git
a/Misc/NEWS.d/next/Library/2024-11-30-21-46-15.gh-issue-127321.M78fBv.rst
b/Misc/NEWS.d/next/Library/2024-11-30-21-46-15.gh-issue-127321.M78fBv.rst
new file mode 100644
index 00000000000000..69b6ce68a47509
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-11-30-21-46-15.gh-issue-127321.M78fBv.rst
@@ -0,0 +1 @@
+:func:`pdb.set_trace` will not stop at an opcode that does not have an
associated line number anymore.
_______________________________________________
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]
