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

Merge pull request #6867 from bluetech/inline-pyobjmixin 

Inline PyobjContext
This commit is contained in:
Ran Benita 2020-03-07 11:58:38 +02:00 committed by GitHub
parent 1df593f978 b7f2e3d4f5
commit 580edc13e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/_pytest/python.py
View File

@ -249,13 +249,10 @@ def pytest_pycollect_makeitem(collector, name, obj):
outcome.force_result(res) outcome.force_result(res)
class PyobjContext: class PyobjMixin:
module = pyobj_property("Module") module = pyobj_property("Module")
cls = pyobj_property("Class") cls = pyobj_property("Class")
instance = pyobj_property("Instance") instance = pyobj_property("Instance")
class PyobjMixin(PyobjContext):
_ALLOW_MARKERS = True _ALLOW_MARKERS = True
@property @property