Merge pull request #6867 from bluetech/inline-pyobjmixin

Inline PyobjContext
2020-03-07 11:58:38 +02:00 · 2020-03-07 11:58:38 +02:00 · 580edc13e7
parent 1df593f978 b7f2e3d4f5
commit 580edc13e7
1 changed files with 1 additions and 4 deletions
--- a/src/_pytest/python.py
+++ b/src/_pytest/python.py
@ -249,13 +249,10 @@ def pytest_pycollect_makeitem(collector, name, obj):
            outcome.force_result(res)


-class PyobjContext:
+class PyobjMixin:
    module = pyobj_property("Module")
    cls = pyobj_property("Class")
    instance = pyobj_property("Instance")
-
-
-class PyobjMixin(PyobjContext):
    _ALLOW_MARKERS = True

    @property