summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2010-02-11 14:16:38 (GMT)
committerMichael Foord <fuzzyman@voidspace.org.uk>2010-02-11 14:16:38 (GMT)
commitcb468b44271329d76af63d48189d57363c1d5dea (patch)
tree3d8048df4be70fb01809ab5b5e271b15dc93fef2
parente3da75a773c7a0b47422fecb5b7500534404dd6d (diff)
downloadcpython-cb468b44271329d76af63d48189d57363c1d5dea.zip
cpython-cb468b44271329d76af63d48189d57363c1d5dea.tar.gz
cpython-cb468b44271329d76af63d48189d57363c1d5dea.tar.bz2
Merged revisions 78158 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78158 | michael.foord | 2010-02-11 14:12:07 +0000 (Thu, 11 Feb 2010) | 1 line Adding TextTestResult to unittest.__all__ ........
-rw-r--r--Lib/unittest/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py
index c12e669..4a308fa 100644
--- a/Lib/unittest/__init__.py
+++ b/Lib/unittest/__init__.py
@@ -47,10 +47,11 @@ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
__all__ = ['TestResult', 'TestCase', 'TestSuite',
'TextTestRunner', 'TestLoader', 'FunctionTestCase', 'main',
'defaultTestLoader', 'SkipTest', 'skip', 'skipIf', 'skipUnless',
- 'expectedFailure']
+ 'expectedFailure', 'TextTestResult']
# Expose obsolete functions for backwards compatibility
__all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases'])
+__all__.append('_TextTestResult')
from .result import TestResult