Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
3 changes: 1 addition & 2 deletions Lib/pdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,7 @@ def user_call(self, frame, argument_list):
def user_line(self, frame):
"""This function is called when we stop or break at this line."""
if self._wait_for_mainpyfile:
if (self.mainpyfile != self.canonic(frame.f_code.co_filename)
or frame.f_lineno <= 0):
if (self.mainpyfile != self.canonic(frame.f_code.co_filename)):
return
self._wait_for_mainpyfile = False
self.bp_commands(frame)
Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_pdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -3948,6 +3948,13 @@ def _create_fake_frozen_module():
# verify that pdb found the source of the "frozen" function
self.assertIn('x = "Sentinel string for gh-93696"', stdout, "Sentinel statement not found")

def test_empty_file(self):
script = ''
commands = 'q\n'
# Anything reasonable is acceptable here, as long as it does not halt
_, _ = self.run_pdb_script(script, commands)
_, _ = self.run_pdb_module(script, commands)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_, _ = self.run_pdb_script(script, commands)
_, _ = self.run_pdb_module(script, commands)
self.run_pdb_script(script, commands)
self.run_pdb_module(script, commands)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about this again and I think we should at least check for something so I changed the test a bit.


def test_non_utf8_encoding(self):
script_dir = os.path.join(os.path.dirname(__file__), 'encoded_modules')
for filename in os.listdir(script_dir):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed the bug where :mod:`pdb` will be stuck in an infinite loop when debugging an empty file.
Loading