Removing Python 2.3 compatibility code from unittest.
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
index d6c8d84..022ed57 100644
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -30,11 +30,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)
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index f5b516c..8fd23c0 100644
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -159,10 +159,9 @@
for name, value in zip(('start', 'pattern', 'top'), args):
setattr(options, name, value)
+ self.failfast = options.failfast
if options.verbose:
self.verbosity = 2
- if options.failfast:
- self.failfast = True
start_dir = options.start
pattern = options.pattern