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.
  ........
................

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 9bae20f12181cc0854e2d21820c2297be17d8cc8..e80e74d5cea1f5c02c7afa38bd26859b2ce1a12d 100644 (file)
--- 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