Merge pull request #1745 from RonnyPfannschmidt/skip-compat

skipping plugin: remove python2.5 compat code
2016-07-20 18:14:20 -03:00 · 2016-07-20 18:14:20 -03:00 · 1204cbade4
parent bcc58ec916 9dadaa8a41
commit 1204cbade4
1 changed files with 1 additions and 5 deletions
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@ -108,11 +108,7 @@ class MarkEvaluator:

    def _getglobals(self):
        d = {'os': os, 'sys': sys, 'config': self.item.config}
-        func = self.item.obj
-        try:
-            d.update(func.__globals__)
-        except AttributeError:
-            d.update(func.func_globals)
+        d.update(self.item.obj.__globals__)
        return d

    def _istrue(self):