From 679113702c54dd9fe5615e1b51af0b50416711b6 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 30 Sep 2002 19:25:56 +0000 Subject: [PATCH] Now that TestCase is a new-style class, change loadTestsFromModule and loadTestsFromName to accept new-style classes too! --- Lib/unittest.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/unittest.py b/Lib/unittest.py index 64d54d8b7df2..9100a78dbbf9 100644 --- a/Lib/unittest.py +++ b/Lib/unittest.py @@ -422,7 +422,8 @@ def loadTestsFromModule(self, module): tests = [] for name in dir(module): obj = getattr(module, name) - if type(obj) == types.ClassType and issubclass(obj, TestCase): + if (isinstance(obj, (type, types.ClassType)) and + issubclass(obj, TestCase)): tests.append(self.loadTestsFromTestCase(obj)) return self.suiteClass(tests) @@ -456,7 +457,8 @@ def loadTestsFromName(self, name, module=None): import unittest if type(obj) == types.ModuleType: return self.loadTestsFromModule(obj) - elif type(obj) == types.ClassType and issubclass(obj, unittest.TestCase): + elif (isinstance(obj, (type, types.ClassType)) and + issubclass(obj, unittest.TestCase)): return self.loadTestsFromTestCase(obj) elif type(obj) == types.UnboundMethodType: return obj.im_class(obj.__name__)