summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSkip Montanaro <skip@pobox.com>2007-11-24 04:29:08 (GMT)
committerSkip Montanaro <skip@pobox.com>2007-11-24 04:29:08 (GMT)
commitd3a1bdf4d93c07e738d454d612a44b9094c67b18 (patch)
tree7aa568663c6aceda1889e61f1ef3e861d9fd9a4c /Lib
parent3e9ac99fe77ef577fe749d8e11364f9fc42afe7e (diff)
downloadcpython-d3a1bdf4d93c07e738d454d612a44b9094c67b18.zip
cpython-d3a1bdf4d93c07e738d454d612a44b9094c67b18.tar.gz
cpython-d3a1bdf4d93c07e738d454d612a44b9094c67b18.tar.bz2
revert change that breaks test_doctest (which I forgot to run - sorry)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/doctest.py11
-rw-r--r--Lib/trace.py2
2 files changed, 0 insertions, 13 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py
index 3c977e1..e874a26 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -320,19 +320,8 @@ 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 3f00605..364e3f7 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -286,8 +286,6 @@ 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]