[Python-checkins] r79275 - in python/branches/py3k: Lib/unittest/__init__.py Lib/unittest/__main__.py Lib/unittest/main.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Mar 22 03:53:52 2010
New Revision: 79275

Log:
Merged revisions 79274 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79274 | michael.foord | 2010-03-21 21:49:08 -0500 (Sun, 21 Mar 2010) | 1 line
  
  Correct usage message displayed for python -m unittest -h
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/unittest/__init__.py
   python/branches/py3k/Lib/unittest/__main__.py
   python/branches/py3k/Lib/unittest/main.py

Modified: python/branches/py3k/Lib/unittest/__init__.py
==============================================================================
--- python/branches/py3k/Lib/unittest/__init__.py	(original)
+++ python/branches/py3k/Lib/unittest/__init__.py	Mon Mar 22 03:53:52 2010
@@ -52,6 +52,7 @@
 # Expose obsolete functions for backwards compatibility
 __all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases'])
 
+__unittest = True
 
 from .result import TestResult
 from .case import (TestCase, FunctionTestCase, SkipTest, skip, skipIf,
@@ -64,5 +65,3 @@
 
 # deprecated
 _TextTestResult = TextTestResult
-
-__unittest = True

Modified: python/branches/py3k/Lib/unittest/__main__.py
==============================================================================
--- python/branches/py3k/Lib/unittest/__main__.py	(original)
+++ python/branches/py3k/Lib/unittest/__main__.py	Mon Mar 22 03:53:52 2010
@@ -6,6 +6,7 @@
 
 __unittest = True
 
+from .main import main, TestProgram, USAGE_AS_MAIN
+TestProgram.USAGE = USAGE_AS_MAIN
 
-from .main import main
 main(module=None)

Modified: python/branches/py3k/Lib/unittest/main.py
==============================================================================
--- python/branches/py3k/Lib/unittest/main.py	(original)
+++ python/branches/py3k/Lib/unittest/main.py	Mon Mar 22 03:53:52 2010
@@ -58,17 +58,11 @@
                                                in MyTestCase
 """
 
-if __name__ == '__main__':
-    USAGE = USAGE_AS_MAIN
-else:
-    USAGE = USAGE_FROM_MODULE
-
-
 class TestProgram(object):
     """A command-line program that runs a set of tests; this is primarily
        for making test modules conveniently executable.
     """
-    USAGE = USAGE
+    USAGE = USAGE_FROM_MODULE
     def __init__(self, module='__main__', defaultTest=None,
                  argv=None, testRunner=None,
                  testLoader=loader.defaultTestLoader, exit=True,