[Python-checkins] r86512 - in python/branches/release27-maint: Lib/unittest/runner.py

benjamin.peterson python-checkins at python.org
Thu Nov 18 15:16:32 CET 2010


Author: benjamin.peterson
Date: Thu Nov 18 15:16:32 2010
New Revision: 86512

Log:
Merged revisions 86511 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86511 | benjamin.peterson | 2010-11-18 08:14:43 -0600 (Thu, 18 Nov 2010) | 1 line
  
  reduce try block compass
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/unittest/runner.py

Modified: python/branches/release27-maint/Lib/unittest/runner.py
==============================================================================
--- python/branches/release27-maint/Lib/unittest/runner.py	(original)
+++ python/branches/release27-maint/Lib/unittest/runner.py	Thu Nov 18 15:16:32 2010
@@ -168,9 +168,10 @@
             results = map(len, (result.expectedFailures,
                                 result.unexpectedSuccesses,
                                 result.skipped))
-            expectedFails, unexpectedSuccesses, skipped = results
         except AttributeError:
             pass
+        else:
+            expectedFails, unexpectedSuccesses, skipped = results
 
         infos = []
         if not result.wasSuccessful():


More information about the Python-checkins mailing list