summaryrefslogtreecommitdiff
path: root/src/_pytest/unittest.py
diff options
context:
space:
mode:
authorRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2018-09-13 15:38:36 +0200
committerRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2018-09-13 15:38:36 +0200
commita0ce9a444188403cbb56cad0f5cb2789cca09826 (patch)
tree83958161ad44b210b72a5db678947cf2e63ea18a /src/_pytest/unittest.py
parent2cf2dc3d95b0b96930744c2ba2b91fd8f58bca21 (diff)
downloadpytest-a0ce9a444188403cbb56cad0f5cb2789cca09826.tar.gz
remove the legacy code about im_func and generalize using fix and compat.getimfunc
Diffstat (limited to 'src/_pytest/unittest.py')
-rw-r--r--src/_pytest/unittest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/_pytest/unittest.py b/src/_pytest/unittest.py
index a135dbd53..a2fd6ad5a 100644
--- a/src/_pytest/unittest.py
+++ b/src/_pytest/unittest.py
@@ -9,6 +9,7 @@ import _pytest._code
from _pytest.config import hookimpl
from _pytest.outcomes import fail, skip, xfail
from _pytest.python import transfer_markers, Class, Module, Function
+from _pytest.compat import getimfunc
def pytest_pycollect_makeitem(collector, name, obj):
@@ -53,7 +54,7 @@ class UnitTestCase(Class):
x = getattr(self.obj, name)
if not getattr(x, "__test__", True):
continue
- funcobj = getattr(x, "im_func", x)
+ funcobj = getimfunc(x)
transfer_markers(funcobj, cls, module)
yield TestCaseFunction(name, parent=self, callobj=funcobj)
foundsomething = True