Merge pull request #2075 from pytest-dev/master

Merge master into features after fixing flake8 errors
2016-11-22 14:10:31 -02:00
parent 75740337d1 a3319ffe80
commit 5ce551e469
40 changed files with 307 additions and 8 deletions
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -214,9 +214,12 @@ class PyobjMixin(PyobjContext):
            if obj is None:
                self._obj = obj = self._getobj()
            return obj
+
        def fset(self, value):
            self._obj = value
+
        return property(fget, fset, None, "underlying python object")
+
    obj = obj()

    def _getobj(self):