From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Mon, 22 Mar 2010 02:49:08 +0000 (+0000)
Subject: Correct usage message displayed for python -m unittest -h
X-Git-Tag: v2.7b1~262
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eef159bd176ffeaae7cdc8450e3d6168fbfe4a59;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py
index 8f77127a0d26..7153802eb7f8 100644
--- 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 5023610c8202..58e646d78590 100644
--- 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 35466ccfabc2..d0da7c070a7d 100644
--- 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,