Merge pull request #2791 from OfirOshir/features

bugfix for issue #2491
2017-10-25 09:04:01 +02:00
parent 083084fcbc d96869ff66
commit f743e95cfc
3 changed files with 18 additions and 9 deletions
@@ -423,12 +423,12 @@ class PytestPluginManager(PluginManager):
        try:
            __import__(importspec)
        except ImportError as e:
-            new_exc = ImportError('Error importing plugin "%s": %s' % (modname, safe_str(e.args[0])))
-            # copy over name and path attributes
-            for attr in ('name', 'path'):
-                if hasattr(e, attr):
-                    setattr(new_exc, attr, getattr(e, attr))
-            raise new_exc
+            new_exc_type = ImportError
+            new_exc_message = 'Error importing plugin "%s": %s' % (modname, safe_str(e.args[0]))
+            new_exc = new_exc_type(new_exc_message)
+
+            six.reraise(new_exc_type, new_exc, sys.exc_info()[2])
+
        except Exception as e:
            import pytest
            if not hasattr(pytest, 'skip') or not isinstance(e, pytest.skip.Exception):