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

fix ordering of import line of last commit

This commit is contained in:
holger krekel 2014-07-03 13:20:51 +02:00
parent a811fabb43
commit e19462d581
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/core.py
View File

@ -221,8 +221,8 @@ class PluginManager(object):
return self.import_plugin(modname[7:]) return self.import_plugin(modname[7:])
raise raise
except: except:
import pytest
e = py.std.sys.exc_info()[1] e = py.std.sys.exc_info()[1]
import pytest
if not hasattr(pytest, 'skip') or not isinstance(e, pytest.skip.Exception): if not hasattr(pytest, 'skip') or not isinstance(e, pytest.skip.Exception):
raise raise
self._warnings.append("skipped plugin %r: %s" %((modname, e.msg))) self._warnings.append("skipped plugin %r: %s" %((modname, e.msg)))