summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-12-21 12:53:36 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-12-21 12:53:36 (GMT)
commitf29f9eca8a214bf65a668ab5d025dc644e9c4e5f (patch)
tree55f1e2137731fe7fad50b4ca8471c1bf03677e61
parentd17f5834415b63c506e5a36347898af522124ef5 (diff)
downloadcpython-f29f9eca8a214bf65a668ab5d025dc644e9c4e5f.zip
cpython-f29f9eca8a214bf65a668ab5d025dc644e9c4e5f.tar.gz
cpython-f29f9eca8a214bf65a668ab5d025dc644e9c4e5f.tar.bz2
Merged revisions 76975 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76975 | r.david.murray | 2009-12-21 07:50:02 -0500 (Mon, 21 Dec 2009) | 9 lines Merged revisions 76973 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76973 | r.david.murray | 2009-12-21 07:45:41 -0500 (Mon, 21 Dec 2009) | 2 lines Remove a leftover from a previous iteration of the issue 7376 patch. ........ ................
-rw-r--r--Lib/doctest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py
index 9bae20f..e80e74d 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -2616,7 +2616,7 @@ def _test():
testfiles = [arg for arg in sys.argv[1:] if arg and arg[0] != '-']
if not testfiles:
name = os.path.basename(sys.argv[0])
- if '__loader__' in globals() and name.endswith('.py'): # python -m
+ if '__loader__' in globals(): # python -m
name, _ = os.path.splitext(name)
print("usage: {0} [-v] file ...".format(name))
return 2