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

[skip.montanaro]

Author: skip.montanaro
Date: Sat Nov 24 05:29:08 2007
New Revision: 59159

Modified:
   python/trunk/Lib/doctest.py
   python/trunk/Lib/trace.py
Log:
revert change that breaks test_doctest (which I forgot to run - sorry)

Modified: python/trunk/Lib/doctest.py
==============================================================================
--- python/trunk/Lib/doctest.py	(original)
+++ python/trunk/Lib/doctest.py	Sat Nov 24 05:29:08 2007
@@ -320,19 +320,8 @@
     """
     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	Sat Nov 24 05:29:08 2007
@@ -286,8 +286,6 @@
             # 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]