back in these go - thanks to Titus Brown for the fix
diff --git a/Lib/doctest.py b/Lib/doctest.py
index d609c5d..f50fce6 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -320,8 +320,21 @@
"""
def __init__(self, out):
self.__out = out
+ self.__debugger_used = False
pdb.Pdb.__init__(self, stdout=out)
+ def set_trace(self, frame=None):
+ self.__debugger_used = True
+ if frame is None:
+ frame = sys._getframe().f_back
+ pdb.Pdb.set_trace(self, frame)
+
+ 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 364e3f7..3f00605 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -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]