jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1745 from RonnyPfannschmidt/skip-compat 

skipping plugin: remove python2.5 compat code
This commit is contained in:
Bruno Oliveira 2016-07-20 18:14:20 -03:00 committed by GitHub
parent bcc58ec916 9dadaa8a41
commit 1204cbade4
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):