[Python-checkins] r59137 - python/trunk/Lib/doctest.py python/trunk/Lib/trace.py

[skip.montanaro]

Author: skip.montanaro
Date: Fri Nov 23 18:08:35 2007
New Revision: 59137

Modified:
   python/trunk/Lib/doctest.py
   python/trunk/Lib/trace.py
Log:
Make trace and doctest play nice together (issue 1429818).  Will backport.


Modified: python/trunk/Lib/doctest.py
==============================================================================
--- python/trunk/Lib/doctest.py	(original)
+++ python/trunk/Lib/doctest.py	Fri Nov 23 18:08:35 2007
@@ -320,8 +320,19 @@
     """
     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

Modified: python/trunk/Lib/trace.py
==============================================================================
--- python/trunk/Lib/trace.py	(original)
+++ python/trunk/Lib/trace.py	Fri Nov 23 18:08:35 2007
@@ -286,6 +286,8 @@
             # 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]