From e19462d58135755a52b9eab91f784928a4d3f210 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Thu, 3 Jul 2014 13:20:51 +0200 Subject: [PATCH] fix ordering of import line of last commit --- _pytest/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_pytest/core.py b/_pytest/core.py index f514eaf3b..6ede18d95 100644 --- a/_pytest/core.py +++ b/_pytest/core.py @@ -221,8 +221,8 @@ class PluginManager(object): return self.import_plugin(modname[7:]) raise except: - import pytest e = py.std.sys.exc_info()[1] + import pytest if not hasattr(pytest, 'skip') or not isinstance(e, pytest.skip.Exception): raise self._warnings.append("skipped plugin %r: %s" %((modname, e.msg)))