Merge pull request #1745 from RonnyPfannschmidt/skip-compat

skipping plugin: remove python2.5 compat code

Author: nicoddemus

_pytest/skipping.py

@@ -108,11 +108,7 @@ def istrue(self):
 
     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):