[Python-checkins] r76976 - in python/branches/release31-maint: Lib/doctest.py

[r.david.murray]

Author: r.david.murray
Date: Mon Dec 21 13:53:36 2009
New Revision: 76976

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/doctest.py

Modified: python/branches/release31-maint/Lib/doctest.py
==============================================================================
--- python/branches/release31-maint/Lib/doctest.py	(original)
+++ python/branches/release31-maint/Lib/doctest.py	Mon Dec 21 13:53:36 2009
@@ -2616,7 +2616,7 @@
     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