summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/__init__.py
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2010-02-10 15:51:42 (GMT)
committerMichael Foord <fuzzyman@voidspace.org.uk>2010-02-10 15:51:42 (GMT)
commit34c9462d713275762803f102a68f23dd2bb7460a (patch)
treeb56e5520cce62534e26f55285f1ded54de3caa06 /Lib/unittest/__init__.py
parent99f69ee7a1cf4d032d420ad69d22bd44b8cf6cc8 (diff)
downloadcpython-34c9462d713275762803f102a68f23dd2bb7460a.zip
cpython-34c9462d713275762803f102a68f23dd2bb7460a.tar.gz
cpython-34c9462d713275762803f102a68f23dd2bb7460a.tar.bz2
Merged revisions 78130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78130 | michael.foord | 2010-02-10 14:25:12 +0000 (Wed, 10 Feb 2010) | 1 line Issue 7893 and Issue 7588 ........
Diffstat (limited to 'Lib/unittest/__init__.py')
-rw-r--r--Lib/unittest/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py
index e0c64d4..c12e669 100644
--- a/Lib/unittest/__init__.py
+++ b/Lib/unittest/__init__.py
@@ -60,4 +60,7 @@ from .suite import TestSuite
from .loader import (TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,
findTestCases)
from .main import TestProgram, main
-from .runner import TextTestRunner
+from .runner import TextTestRunner, TextTestResult
+
+# deprecated
+_TextTestResult = TextTestResult