AttributeError chaining bug #1944 fix

2016-09-18 22:34:48 +07:00 · 2016-09-18 22:34:48 +07:00 · 65be1231b1
parent 8639bf7554
commit 65be1231b1
1 changed files with 3 additions and 4 deletions
--- a/_pytest/python.py
+++ b/_pytest/python.py
@ -205,9 +205,8 @@ class PyobjContext(object):
 class PyobjMixin(PyobjContext):
    def obj():
        def fget(self):
-            try:
-                return self._obj
-            except AttributeError:
+            obj = getattr(self, '_obj', None)
+            if obj is None:
                self._obj = obj = self._getobj()
            return obj
        def fset(self, value):