diff options
| author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-03-22 01:41:11 +0000 |
|---|---|---|
| committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-03-22 01:41:11 +0000 |
| commit | 49899690a8867029076b1a336678479750fd78c9 (patch) | |
| tree | fc2935f33e09cf42908300cf02efaf744653c04a /Lib/unittest/loader.py | |
| parent | db003cb3d17ecac870d6af1b2c408f887a93f2e3 (diff) | |
| download | cpython-git-49899690a8867029076b1a336678479750fd78c9.tar.gz | |
Removing Python 2.3 compatibility code from unittest.
Diffstat (limited to 'Lib/unittest/loader.py')
| -rw-r--r-- | Lib/unittest/loader.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py index d6c8d84245..022ed57816 100644 --- a/Lib/unittest/loader.py +++ b/Lib/unittest/loader.py @@ -30,11 +30,7 @@ VALID_MODULE_NAME = re.compile(r'[_a-z]\w*\.py$', re.IGNORECASE) def _make_failed_import_test(name, suiteClass): - message = 'Failed to import test module: %s' % name - if hasattr(traceback, 'format_exc'): - # Python 2.3 compatibility - # format_exc returns two frames of discover.py as well - message += '\n%s' % traceback.format_exc() + message = 'Failed to import test module: %s\n%s' % (name, traceback.format_exc()) return _make_failed_test('ModuleImportFailure', name, ImportError(message), suiteClass) |