Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions Lib/pdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -1971,12 +1971,6 @@ def do_list(self, arg):
if last is None:
last = first + 10
filename = self.curframe.f_code.co_filename
# gh-93696: stdlib frozen modules provide a useful __file__
# this workaround can be removed with the closure of gh-89815
if filename.startswith("<frozen"):
tmp = self.curframe.f_globals.get("__file__")
if isinstance(tmp, str):
filename = tmp
breaklist = self.get_file_breaks(filename)
try:
lines = linecache.getlines(filename, self.curframe.f_globals)
Expand Down
22 changes: 18 additions & 4 deletions Lib/test/test_pdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -4260,13 +4260,22 @@ def _create_fake_frozen_module():
mod = _create_fake_frozen_module()
mod.func()
"""
commands = """
commands_list = """
break 20
continue
step
break 4
list
quit
"""
commands_longlist = """
break 20
continue
step
break 4
longlist
quit
"""
with open('gh93696.py', 'w') as f:
f.write(textwrap.dedent(frozen_src))

Expand All @@ -4275,9 +4284,14 @@ def _create_fake_frozen_module():

self.addCleanup(os_helper.unlink, 'gh93696.py')
self.addCleanup(os_helper.unlink, 'gh93696_host.py')
stdout, stderr = self._run_pdb(["gh93696_host.py"], commands)
# verify that pdb found the source of the "frozen" function
self.assertIn('x = "Sentinel string for gh-93696"', stdout, "Sentinel statement not found")

# verify that pdb found the source of the "frozen" function and it
# shows the breakpoint at the correct line for both list and longlist
for commands in (commands_list, commands_longlist):
stdout, _ = self._run_pdb(["gh93696_host.py"], commands)
self.assertIn('x = "Sentinel string for gh-93696"', stdout, "Sentinel statement not found")
self.assertIn('4 B', stdout, "breakpoint not found")
self.assertIn('-> def func():', stdout, "stack entry not found")

def test_empty_file(self):
script = ''
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed the breakpoint display error for frozen modules in :mod:`pdb`.
Loading