Author: mattip <matti.pi...@gmail.com>
Branch: fortran-order
Changeset: r79912:e456a1c6df81
Date: 2015-09-30 23:38 +0300
http://bitbucket.org/pypy/pypy/changeset/e456a1c6df81/
Log: revert, do not change this file
diff --git a/_pytest/core.py b/_pytest/core.py
--- a/_pytest/core.py
+++ b/_pytest/core.py
@@ -175,7 +175,7 @@
continue
try:
plugin = ep.load()
- except (DistributionNotFound, ImportError):
+ except DistributionNotFound:
continue
self._plugin_distinfo.append((ep.dist, plugin))
self.register(plugin, name=name)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
