[Python-checkins] r78159 - in python/branches/py3k: Lib/unittest/__init__.py

[michael.foord]

Author: michael.foord
Date: Thu Feb 11 15:16:38 2010
New Revision: 78159

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/unittest/__init__.py

Modified: python/branches/py3k/Lib/unittest/__init__.py
==============================================================================
--- python/branches/py3k/Lib/unittest/__init__.py	(original)
+++ python/branches/py3k/Lib/unittest/__init__.py	Thu Feb 11 15:16:38 2010
@@ -47,10 +47,11 @@
 __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