summaryrefslogtreecommitdiff
path: root/Lib/unittest.py
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2009-06-02 18:08:27 +0000
committerMichael Foord <fuzzyman@voidspace.org.uk>2009-06-02 18:08:27 +0000
commitdad7b7b1cb83d6ead5e8af5c747256a1aaa3f6cf (patch)
treebdaebac657d955b8b48ba299aeb22c567e699021 /Lib/unittest.py
parentabb4ec6dc484e6783541b1bcc88d03fe32357145 (diff)
downloadcpython-git-dad7b7b1cb83d6ead5e8af5c747256a1aaa3f6cf.tar.gz
Restore default testRunner argument in unittest.main to None. Issue 6177
Diffstat (limited to 'Lib/unittest.py')
-rw-r--r--Lib/unittest.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/unittest.py b/Lib/unittest.py
index c8943e7f12..bf7baa11c8 100644
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -1640,9 +1640,11 @@ class TestProgram(object):
"""
USAGE = USAGE
def __init__(self, module='__main__', defaultTest=None,
- argv=None, testRunner=TextTestRunner,
+ argv=None, testRunner=None,
testLoader=defaultTestLoader, exit=True,
verbosity=1):
+ if testRunner is None:
+ testRunner = TextTestRunner
if isinstance(module, basestring):
self.module = __import__(module)
for part in module.split('.')[1:]: