]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.13] gh-100141: Allow pdb to deal with empty file (GH-125425) (#125536)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Tue, 15 Oct 2024 16:28:57 +0000 (18:28 +0200)
committerGitHub <noreply@github.com>
Tue, 15 Oct 2024 16:28:57 +0000 (16:28 +0000)
gh-100141: Allow pdb to deal with empty file (GH-125425)
(cherry picked from commit bb9604b62ae7f043594ffea9287f9213067cc7fb)

Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>
Lib/pdb.py
Lib/test/test_pdb.py
Misc/NEWS.d/next/Library/2024-10-14-02-27-03.gh-issue-100141.NuAcwa.rst [new file with mode: 0644]

index a42b8881f036f0048f1571dd0a201129bae74950..169eb0e49c4a31a970e608b1a90fc56cb9a3eaa8 100755 (executable)
@@ -429,8 +429,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
     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
         if self.bp_commands(frame):
index 35285b7706bb70b7547bb94367ac3e31a6326dbf..266141e566a1ed09aa97de1be6bf5a9351739104 100644 (file)
@@ -3781,6 +3781,16 @@ def bœr():
         # 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'
+        # We check that pdb stopped at line 0, but anything reasonable
+        # is acceptable here, as long as it does not halt
+        stdout, _ = self.run_pdb_script(script, commands)
+        self.assertIn('main.py(0)', stdout)
+        stdout, _ = self.run_pdb_module(script, commands)
+        self.assertIn('__main__.py(0)', stdout)
+
     def test_non_utf8_encoding(self):
         script_dir = os.path.join(os.path.dirname(__file__), 'encoded_modules')
         for filename in os.listdir(script_dir):
diff --git a/Misc/NEWS.d/next/Library/2024-10-14-02-27-03.gh-issue-100141.NuAcwa.rst b/Misc/NEWS.d/next/Library/2024-10-14-02-27-03.gh-issue-100141.NuAcwa.rst
new file mode 100644 (file)
index 0000000..c366b0a
--- /dev/null
@@ -0,0 +1 @@
+Fixed the bug where :mod:`pdb` will be stuck in an infinite loop when debugging an empty file.