From 3d18c9c1c6e58e30da97e74fc79efb91f1aae24e Mon Sep 17 00:00:00 2001
From: Barney Gale <barney.gale@gmail.com>
Date: Sun, 18 Dec 2016 21:30:00 +0000
Subject: [PATCH] 'xfail' markers without a condition no longer rely on the
 underlying `Item` deriving from `PyobjMixin`

---
 _pytest/skipping.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_pytest/skipping.py b/_pytest/skipping.py
index a8eaea98a..cfaed2fa7 100644
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -119,7 +119,6 @@ class MarkEvaluator:
         if hasattr(self, 'result'):
             return self.result
         if self.holder:
-            d = self._getglobals()
             if self.holder.args or 'condition' in self.holder.kwargs:
                 self.result = False
                 # "holder" might be a MarkInfo or a MarkDecorator; only
@@ -135,6 +134,7 @@ class MarkEvaluator:
                     for expr in args:
                         self.expr = expr
                         if isinstance(expr, py.builtin._basestring):
+                            d = self._getglobals()
                             result = cached_eval(self.item.config, expr, d)
                         else:
                             if "reason" not in kwargs: