Merged revisions 79268 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79268 | michael.foord | 2010-03-21 20:41:11 -0500 (Sun, 21 Mar 2010) | 1 line
Removing Python 2.3 compatibility code from unittest.
........
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
index eea5c13..5d11b6e 100644
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -19,11 +19,7 @@
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)