commit 5d1155c08edf7f53eca804b2b6538636c2dfe711
author Florent Xicluna <florent.xicluna@gmail.com> Fri Oct 28 14:45:05 2011 +0200
committer Florent Xicluna <florent.xicluna@gmail.com> Fri Oct 28 14:45:05 2011 +0200
tree dcb2cf857c20dce837c82de7aea432ccf9a41355
parent f99e4b5dbef57e13dd603dcc0edd9b7318f08c28

Closes #13258: Use callable() built-in in the standard library.

Lib/unittest/loader.py

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 @@
                 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 @@
         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: