Commit 531e89b7 authored by Denis Bilenko's avatar Denis Bilenko

hub: when importing greenlet causes ImportError, print the original message raised

- because the original ImportError does not necessarily complain about greenlet,
  it may also complain about setuptools (No module named pkg_resources).
parent 0a47646f
...@@ -19,13 +19,19 @@ __all__ = ['getcurrent', ...@@ -19,13 +19,19 @@ __all__ = ['getcurrent',
'Waiter'] 'Waiter']
try: def __import_py_magic_greenlet():
greenlet = __import__('greenlet').greenlet
except ImportError:
try: try:
from py.magic import greenlet from py.magic import greenlet
return greenlet
except ImportError: except ImportError:
raise ImportError('gevent requires greenlet: http://pypi.python.org/pypi/greenlet/') pass
try:
greenlet = __import__('greenlet').greenlet
except ImportError:
greenlet = __import_py_magic_greenlet()
if greenlet is None:
raise
getcurrent = greenlet.getcurrent getcurrent = greenlet.getcurrent
GreenletExit = greenlet.GreenletExit GreenletExit = greenlet.GreenletExit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment