mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 11:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Patch from Georg Brandl and me for #1493

Browse source 
Remove unbound method objects
This commit is contained in:
Christian Heimes 2007-11-25 09:39:14 +00:00
parent 91c77301bf
commit 4a22b5dee7
19 changed files with 65 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/unittest.py
View file

@ -559,13 +559,18 @@ class TestLoader:
return self.loadTestsFromModule(obj)
elif isinstance(obj, type) and issubclass(obj, TestCase):
return self.loadTestsFromTestCase(obj)
elif (isinstance(obj, types.UnboundMethodType) and
elif (isinstance(obj, types.FunctionType) and
isinstance(parent, type) and
issubclass(parent, TestCase)):
return TestSuite([parent(obj.__name__)])
name = obj.__name__
inst = parent(name)
# static methods follow a different path
if not(isinstance(getattr(inst, name), types.FunctionType)):
return TestSuite([inst])
elif isinstance(obj, TestSuite):
return obj
elif hasattr(obj, '__call__'):
if hasattr(obj, '__call__'):
test = obj()
if isinstance(test, TestSuite):
return test