commit 434ae7703d08ab47dab0fcf9f382bbe7ae2996a1
author Benjamin Peterson <benjamin@python.org> Mon Mar 22 01:46:47 2010 +0000
committer Benjamin Peterson <benjamin@python.org> Mon Mar 22 01:46:47 2010 +0000
tree c5a5f1eb91b447a65ea9fe6b8c3d10ab06899ed3
parent 8769fd8a17dad1b1861c04ea75ce46478d21a34d

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.
........

Lib/unittest/main.py

diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index 63fbd16..1db7978 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