p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

__code__ and __self__ are attributes in python2.6+

This commit is contained in:
Anthony Sottile 2018-06-03 11:57:32 -07:00
parent 3d0717813a
commit 04f08b67a4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/compat.py
View File

@ -83,7 +83,7 @@ def iscoroutinefunction(func):
def getlocation(function, curdir): def getlocation(function, curdir):
fn = py.path.local(inspect.getfile(function)) fn = py.path.local(inspect.getfile(function))
lineno = py.builtin._getcode(function).co_firstlineno lineno = function.__code__.co_firstlineno
if fn.relto(curdir): if fn.relto(curdir):
fn = fn.relto(curdir) fn = fn.relto(curdir)
return "%s:%d" % (fn, lineno + 1) return "%s:%d" % (fn, lineno + 1)

3
src/_pytest/fixtures.py
View File

@ -354,8 +354,7 @@ class FixtureRequest(FuncargnamesCompatAttr):
return self._pyfuncitem._testcase return self._pyfuncitem._testcase
except AttributeError: except AttributeError:
function = getattr(self, "function", None) function = getattr(self, "function", None)
if function is not None: return getattr(function, "__self__", None)
return py.builtin._getimself(function)
@scopeproperty() @scopeproperty()
def module(self): def module(self):