From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Thu, 11 Feb 2010 14:16:38 +0000 (+0000)
Subject: Merged revisions 78158 via svnmerge from
X-Git-Tag: v3.2a1~1701
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb468b44271329d76af63d48189d57363c1d5dea;p=thirdparty%2FPython%2Fcpython.git

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 c12e669790f5..4a308fa1c46b 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