diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-03-22 02:53:52 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-03-22 02:53:52 (GMT) |
| commit | eab4b4c784c4351e4b3ea7ead277180d88293f23 (patch) | |
| tree | 25ddaece7ee06d7f9fdff415b65fc4c29cc2b778 /Lib | |
| parent | f8197c3489ff7a12259d9eac6d284514f113c0fe (diff) | |
| download | cpython-eab4b4c784c4351e4b3ea7ead277180d88293f23.zip cpython-eab4b4c784c4351e4b3ea7ead277180d88293f23.tar.gz cpython-eab4b4c784c4351e4b3ea7ead277180d88293f23.tar.bz2 | |
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
........
Diffstat (limited to 'Lib')
| -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 f2f1044..0154017 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, |