[Python-checkins] r79274 - in python/trunk/Lib/unittest: __init__.py __main__.py main.py

[michael.foord]

Author: michael.foord
Date: Mon Mar 22 03:49:08 2010
New Revision: 79274

Log:
Correct usage message displayed for python -m unittest -h

Modified:
   python/trunk/Lib/unittest/__init__.py
   python/trunk/Lib/unittest/__main__.py
   python/trunk/Lib/unittest/main.py

Modified: python/trunk/Lib/unittest/__init__.py
==============================================================================
--- python/trunk/Lib/unittest/__init__.py	(original)
+++ python/trunk/Lib/unittest/__init__.py	Mon Mar 22 03:49:08 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/trunk/Lib/unittest/__main__.py
==============================================================================
--- python/trunk/Lib/unittest/__main__.py	(original)
+++ python/trunk/Lib/unittest/__main__.py	Mon Mar 22 03:49:08 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/trunk/Lib/unittest/main.py
==============================================================================
--- python/trunk/Lib/unittest/main.py	(original)
+++ python/trunk/Lib/unittest/main.py	Mon Mar 22 03:49:08 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,