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__
........

diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py
index c12e669790f5db0e7786a53739c4bf9117e6f0e2..4a308fa1c46b4d3f12863c0c6df223c9f84316ae 100644 (file)
--- 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