Make trace and doctest play nice together (issue 1429818). Will backport.

diff --git a/Lib/doctest.py b/Lib/doctest.py
index e874a26817b1f3d0a7ffd1dbb24ab758aef11768..3c977e1519c0d3e6c48909cbd48c606b81b96824 100644 (file)
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -320,8 +320,19 @@ class _OutputRedirectingPdb(pdb.Pdb):
     """
     def __init__(self, out):
         self.__out = out
+        self.__debugger_used = False
         pdb.Pdb.__init__(self, stdout=out)
 
+    def set_trace(self):
+        self.__debugger_used = True
+        pdb.Pdb.set_trace(self)
+
+    def set_continue(self):
+        # Calling set_continue unconditionally would break unit test
+        # coverage reporting, as Bdb.set_continue calls sys.settrace(None).
+        if self.__debugger_used:
+            pdb.Pdb.set_continue(self)
+
     def trace_dispatch(self, *args):
         # Redirect stdout to the given stream.
         save_stdout = sys.stdout

diff --git a/Lib/trace.py b/Lib/trace.py
index 364e3f7bc99ab4951a540308e42418c7e60d2317..3f006052544b43b25f862e8e3c5313400f341067 100644 (file)
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -286,6 +286,8 @@ class CoverageResults:
             # skip some "files" we don't care about...
             if filename == "<string>":
                 continue
+            if filename.startswith("<doctest "):
+                continue
 
             if filename.endswith((".pyc", ".pyo")):
                 filename = filename[:-1]