Merged revisions 76937 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
r76934 does not apply and was deleted in the merge.
................
r76937 | r.david.murray | 2009-12-20 12:28:31 -0500 (Sun, 20 Dec 2009) | 20 lines
Merged revisions 76934-76935 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76934 | r.david.murray | 2009-12-20 11:24:46 -0500 (Sun, 20 Dec 2009) | 2 lines
Fix comment typo.
........
r76935 | r.david.murray | 2009-12-20 11:46:06 -0500 (Sun, 20 Dec 2009) | 10 lines
Issue #7376: When called with no arguments doctest was running a
self-test. Because of a change to the way tracebacks are printed,
this self-test was failing. The test is run (and passes) during normal
regression testing. So instead of running the failing self-test this
patch makes doctest emit a usage message. This is better behavior anyway
since passing in arguments is the real reason to run doctest as a command.
Bug discovery and initial patch by Florent Xicluna.
........
................
diff --git a/Misc/NEWS b/Misc/NEWS
index f40ae65..dc33c56 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -217,6 +217,9 @@
Tests
-----
+- Issue #7376: instead of running a self-test (which was failing) when called
+ with no arguments, doctest.py now gives a usage message.
+
- Issue #7498: test_multiprocessing now uses test.support.find_unused_port
instead of a hardcoded port number in test_rapid_restart.