commit 9c164af6c35cc0a0b21162d74bd7ea572731ed2c
author Michael Foord <fuzzyman@voidspace.org.uk> Sat May 08 17:06:25 2010 +0000
committer Michael Foord <fuzzyman@voidspace.org.uk> Sat May 08 17:06:25 2010 +0000
tree 6ce4a91fc6328b49b45151eca1fbbedd404dfc4d
parent 7daf0e4aa13b98d5217dc49e5f87e7a4007aee33

unittest: issue 8301. Adding functions to test suites no longer crashes.

Lib/unittest/suite.py

diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index 0dd2dc5..cf6d94a 100644
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -119,7 +119,12 @@
         if getattr(currentClass, "__unittest_skip__", False):
             return
 
-        currentClass._classSetupFailed = False
+        try:
+            currentClass._classSetupFailed = False
+        except TypeError:
+            # test may actually be a function
+            # so its class will be a builtin-type
+            pass
 
         setUpClass = getattr(currentClass, 'setUpClass', None)
         if setUpClass is not None: