From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 21 Dec 2009 12:53:36 +0000 (+0000)
Subject: Merged revisions 76975 via svnmerge from
X-Git-Tag: v3.1.2rc1~234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f29f9eca8a214bf65a668ab5d025dc644e9c4e5f;p=python

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 9bae20f121..e80e74d5ce 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