AttributeError chaining bug pytest-dev#1944 fix

axil · Sep 19, 2016 · 65be123 · 65be123
1 parent 8639bf7
commit 65be123
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/_pytest/python.py b/_pytest/python.py
@@ -205,11 +205,10 @@ 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
+            return obj
         def fset(self, value):
             self._obj = value
         return property(fget, fset, None, "underlying python object")