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/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 @@
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,