]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-43318: Fix a bug where pdb does not always echo cleared breakpoints (GH-24646...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Fri, 11 Jun 2021 16:18:19 +0000 (09:18 -0700)
committerGitHub <noreply@github.com>
Fri, 11 Jun 2021 16:18:19 +0000 (17:18 +0100)
(cherry picked from commit 4cb6ba14325cff98589c2660d1d2c65f4aacfee4)

Co-authored-by: huzhaojie <hu.zj@foxmail.com>
Lib/pdb.py
Lib/test/test_pdb.py
Misc/NEWS.d/next/Library/2021-02-25-08-32-06.bpo-43318.bZJw6V.rst [new file with mode: 0644]

index 081a8449d4109693374d67d9bf746c2f6259b2bb..ff40f7b2476a38158cb189c4f18a15a889649a24 100755 (executable)
@@ -893,7 +893,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
             except ValueError:
                 err = "Invalid line number (%s)" % arg
             else:
-                bplist = self.get_breaks(filename, lineno)
+                bplist = self.get_breaks(filename, lineno)[:]
                 err = self.clear_break(filename, lineno)
             if err:
                 self.error(err)
index f944acd69204369e36588d4182041f5cbf31b03e..3bece762558e4299429fa3b9ace0615690ba1107 100644 (file)
@@ -1322,6 +1322,35 @@ def test_pdb_issue_20766():
     pdb 2: <built-in function default_int_handler>
     """
 
+def test_pdb_issue_43318():
+    """echo breakpoints cleared with filename:lineno
+
+    >>> def test_function():
+    ...     import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+    ...     print(1)
+    ...     print(2)
+    ...     print(3)
+    ...     print(4)
+    >>> reset_Breakpoint()
+    >>> with PdbTestInput([  # doctest: +NORMALIZE_WHITESPACE
+    ...     'break 3',
+    ...     'clear <doctest test.test_pdb.test_pdb_issue_43318[0]>:3',
+    ...     'continue'
+    ... ]):
+    ...     test_function()
+    > <doctest test.test_pdb.test_pdb_issue_43318[0]>(3)test_function()
+    -> print(1)
+    (Pdb) break 3
+    Breakpoint 1 at <doctest test.test_pdb.test_pdb_issue_43318[0]>:3
+    (Pdb) clear <doctest test.test_pdb.test_pdb_issue_43318[0]>:3
+    Deleted breakpoint 1 at <doctest test.test_pdb.test_pdb_issue_43318[0]>:3
+    (Pdb) continue
+    1
+    2
+    3
+    4
+    """
+
 
 class PdbTestCase(unittest.TestCase):
     def tearDown(self):
diff --git a/Misc/NEWS.d/next/Library/2021-02-25-08-32-06.bpo-43318.bZJw6V.rst b/Misc/NEWS.d/next/Library/2021-02-25-08-32-06.bpo-43318.bZJw6V.rst
new file mode 100644 (file)
index 0000000..c2c9c87
--- /dev/null
@@ -0,0 +1 @@
+Fix a bug where :mod:`pdb` does not always echo cleared breakpoints.