diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 14:52:29 +0200 |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 14:52:29 +0200 |
| commit | aabbda5354407cfe35097c7f17717a716a3d80c4 (patch) | |
| tree | e15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/unittest/loader.py | |
| parent | ac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff) | |
| parent | 5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff) | |
| download | cpython-git-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz | |
Merge 3.2
Diffstat (limited to 'Lib/unittest/loader.py')
| -rw-r--r-- | Lib/unittest/loader.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py index afdff67164..cb92fd29ba 100644 --- a/Lib/unittest/loader.py +++ b/Lib/unittest/loader.py @@ -113,7 +113,7 @@ class TestLoader(object): return self.suiteClass([inst]) elif isinstance(obj, suite.TestSuite): return obj - if hasattr(obj, '__call__'): + if callable(obj): test = obj() if isinstance(test, suite.TestSuite): return test @@ -138,7 +138,7 @@ class TestLoader(object): def isTestMethod(attrname, testCaseClass=testCaseClass, prefix=self.testMethodPrefix): return attrname.startswith(prefix) and \ - hasattr(getattr(testCaseClass, attrname), '__call__') + callable(getattr(testCaseClass, attrname)) testFnNames = testFnNames = list(filter(isTestMethod, dir(testCaseClass))) if self.sortTestMethodsUsing: |