diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:45:05 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:45:05 (GMT) |
| commit | 5d1155c08edf7f53eca804b2b6538636c2dfe711 (patch) | |
| tree | dcb2cf857c20dce837c82de7aea432ccf9a41355 /Lib/unittest/loader.py | |
| parent | f99e4b5dbef57e13dd603dcc0edd9b7318f08c28 (diff) | |
| download | cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.zip cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.gz cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.bz2 | |
Closes #13258: Use callable() built-in in the standard library.
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 afdff67..cb92fd2 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: |