[Python-checkins] r59174 - in python/branches/release25-maint: Lib/doctest.py Lib/trace.py Misc/NEWS
skip.montanaro
python-checkins at python.org
Sat Nov 24 15:31:16 CET 2007
Author: skip.montanaro
Date: Sat Nov 24 15:31:16 2007
New Revision: 59174
Modified:
python/branches/release25-maint/Lib/doctest.py
python/branches/release25-maint/Lib/trace.py
python/branches/release25-maint/Misc/NEWS
Log:
back in these go - thanks to Titus Brown for the fix
Modified: python/branches/release25-maint/Lib/doctest.py
==============================================================================
--- python/branches/release25-maint/Lib/doctest.py (original)
+++ python/branches/release25-maint/Lib/doctest.py Sat Nov 24 15:31:16 2007
@@ -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
Modified: python/branches/release25-maint/Lib/trace.py
==============================================================================
--- python/branches/release25-maint/Lib/trace.py (original)
+++ python/branches/release25-maint/Lib/trace.py Sat Nov 24 15:31:16 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]
Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS (original)
+++ python/branches/release25-maint/Misc/NEWS Sat Nov 24 15:31:16 2007
@@ -41,6 +41,9 @@
Library
-------
+- Issue 1429818: patch for trace and doctest modules so they play nicely
+ together.
+
- doctest mis-used __loader__.get_data(), assuming universal newlines was used.
- Issue #1705170: contextlib.contextmanager was still swallowing
More information about the Python-checkins
mailing list