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

diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py
index 8f77127a0d26d00e1096cb3b0f5dc328875bf417..7153802eb7f8458abb848f9ff8a548a61e8614c6 100644 (file)
--- a/Lib/unittest/__init__.py
+++ b/Lib/unittest/__init__.py
@@ -52,6 +52,7 @@ __all__ = ['TestResult', 'TestCase', 'TestSuite',
 # 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 @@ from .runner import TextTestRunner, TextTestResult
 
 # deprecated
 _TextTestResult = TextTestResult
-
-__unittest = True

diff --git a/Lib/unittest/__main__.py b/Lib/unittest/__main__.py
index 5023610c8202af1528482b187cdc443ba4df2616..58e646d78590134ebeb0d1e5f500e9a7d29a8689 100644 (file)
--- a/Lib/unittest/__main__.py
+++ b/Lib/unittest/__main__.py
@@ -6,6 +6,7 @@ if sys.argv[0].endswith("__main__.py"):
 
 __unittest = True
 
+from .main import main, TestProgram, USAGE_AS_MAIN
+TestProgram.USAGE = USAGE_AS_MAIN
 
-from .main import main
 main(module=None)

diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index f2f10448afe7fd2760feffcc135cc68950621bd1..0154017a924f0ffd70a9e5e0afe7901250f40d1d 100644 (file)
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -58,17 +58,11 @@ Examples:
                                                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,