diff options
author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-03-22 02:49:08 (GMT) |
---|---|---|
committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-03-22 02:49:08 (GMT) |
commit | eef159bd176ffeaae7cdc8450e3d6168fbfe4a59 (patch) | |
tree | bd2aee7ff540edd450cda35795a711907cfbb7ad /Lib/unittest | |
parent | 0ce167277a1999ceab79c84a871ed069c97f4ca7 (diff) | |
download | cpython-eef159bd176ffeaae7cdc8450e3d6168fbfe4a59.zip cpython-eef159bd176ffeaae7cdc8450e3d6168fbfe4a59.tar.gz cpython-eef159bd176ffeaae7cdc8450e3d6168fbfe4a59.tar.bz2 |
Correct usage message displayed for python -m unittest -h
Diffstat (limited to 'Lib/unittest')
-rw-r--r-- | Lib/unittest/__init__.py | 3 | ||||
-rw-r--r-- | Lib/unittest/__main__.py | 3 | ||||
-rw-r--r-- | Lib/unittest/main.py | 8 |
3 files changed, 4 insertions, 10 deletions
diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py index 8f77127..7153802 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 5023610..58e646d 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 35466cc..d0da7c0 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, |