[Pytest-commit] commit/pytest: hpk42: fix ordering of import line of last commit

[commits-noreply at bitbucket.org]

1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/8a72cc33da81/
Changeset:   8a72cc33da81
User:        hpk42
Date:        2014-07-03 13:20:51
Summary:     fix ordering of import line of last commit
Affected #:  1 file

diff -r 49db048a7f4f83fe07b74000b02c3d60043cfcd2 -r 8a72cc33da81fea3542e3b69c3371a7b12de9e67 _pytest/core.py
--- a/_pytest/core.py
+++ b/_pytest/core.py
@@ -221,8 +221,8 @@
                 return self.import_plugin(modname[7:])
             raise
         except:
+            e = py.std.sys.exc_info()[1]
             import pytest
-            e = py.std.sys.exc_info()[1]
             if not hasattr(pytest, 'skip') or not isinstance(e, pytest.skip.Exception):
                 raise
             self._warnings.append("skipped plugin %r: %s" %((modname, e.msg)))

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.