diff options
| author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-04-25 19:53:49 +0000 |
|---|---|---|
| committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-04-25 19:53:49 +0000 |
| commit | de4ceabfd8b9cf357332e7fa1bfb46c157402efa (patch) | |
| tree | 838eeb9e95f3f72beeb754e17c6f20c9dc8ff24b /Lib/unittest/__init__.py | |
| parent | af30c5d32e52ec61cb9964dcb44f9b7eae82cfa9 (diff) | |
| download | cpython-git-de4ceabfd8b9cf357332e7fa1bfb46c157402efa.tar.gz | |
Merged revisions 80476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80476 | michael.foord | 2010-04-25 20:02:46 +0100 (Sun, 25 Apr 2010) | 1 line
Adding unittest.removeHandler function / decorator for removing the signal.SIGINT signal handler. With tests and docs.
........
Diffstat (limited to 'Lib/unittest/__init__.py')
| -rw-r--r-- | Lib/unittest/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py index e84299e993..201a3f0d2d 100644 --- a/Lib/unittest/__init__.py +++ b/Lib/unittest/__init__.py @@ -48,7 +48,7 @@ __all__ = ['TestResult', 'TestCase', 'TestSuite', 'TextTestRunner', 'TestLoader', 'FunctionTestCase', 'main', 'defaultTestLoader', 'SkipTest', 'skip', 'skipIf', 'skipUnless', 'expectedFailure', 'TextTestResult', 'installHandler', - 'registerResult', 'removeResult'] + 'registerResult', 'removeResult', 'removeHandler'] # Expose obsolete functions for backwards compatibility __all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases']) @@ -63,7 +63,7 @@ from .loader import (TestLoader, defaultTestLoader, makeSuite, getTestCaseNames, findTestCases) from .main import TestProgram, main from .runner import TextTestRunner, TextTestResult -from .signals import installHandler, registerResult, removeResult +from .signals import installHandler, registerResult, removeResult, removeHandler # deprecated _TextTestResult = TextTestResult |