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/Lib/runpy.py b/Lib/runpy.py
index 46e138e..6e94d6b 100644
--- a/Lib/runpy.py
+++ b/Lib/runpy.py
@@ -125,7 +125,7 @@
Note that the executed module will have full access to the
__main__ namespace. If this is not desirable, the run_module()
- function sbould be used to run the module code in a fresh namespace.
+ function should be used to run the module code in a fresh namespace.
At the very least, these variables in __main__ will be overwritten:
__name__