p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skipping plugin: remove python2.5 compat code

This commit is contained in:
Ronny Pfannschmidt 2016-07-20 17:45:20 +02:00
parent bcc58ec916
commit 9dadaa8a41
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/skipping.py
View File

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