revert 1735 - fix issue95 differently: just shift the offending zlib

import (and others) to happen when they are actually needed

--HG--
branch : trunk
This commit is contained in:
holger krekel
2010-05-19 16:42:22 +02:00
parent c3bd29b490
commit 2229d2d947
5 changed files with 10 additions and 41 deletions

View File

@@ -140,13 +140,6 @@ class PluginManager(object):
except py.test.skip.Exception:
e = py.std.sys.exc_info()[1]
self._hints.append("skipped plugin %r: %s" %((modname, e.msg)))
except ImportError:
e = py.std.sys.exc_info()[1]
if "zlib" in str(e) and modname == "pytest_genscript":
self._hints.append("skipped plugin %r: failed to import %r" %(
(modname, str(e))))
else:
raise
else:
check_old_use(mod, modname)
self.register(mod)