hubs: delay import pkg_resources

https://github.com/eventlet/eventlet/issues/177

2 files changed, 13 insertions, 9 deletions

diff --git a/eventlet/hubs/__init__.py b/eventlet/hubs/__init__.py
index 57889d7..9f72c16 100644
--- a/eventlet/hubs/__init__.py
+++ b/eventlet/hubs/__init__.py
@@ -1,14 +1,7 @@
-import sys
 import os
-from eventlet.support import greenlets as greenlet, six
-from eventlet import patcher
 
-try:
-    # try and import pkg_resources ...
-    import pkg_resources
-except ImportError:
-    # ... but do not depend on it
-    pkg_resources = None
+from eventlet import patcher
+from eventlet.support import greenlets as greenlet, six
 
 
 __all__ = ["use_hub", "get_hub", "get_default_hub", "trampoline"]
@@ -86,6 +79,15 @@ def use_hub(mod=None):
                 mod = getattr(mod, classname)
         else:
             found = False
+
+            # setuptools 5.4.1 test_import_patched_defaults fail
+            # https://github.com/eventlet/eventlet/issues/177
+            try:
+                # try and import pkg_resources ...
+                import pkg_resources
+            except ImportError:
+                # ... but do not depend on it
+                pkg_resources = None
             if pkg_resources is not None:
                 for entry in pkg_resources.iter_entry_points(
                         group='eventlet.hubs', name=mod):
@@ -115,6 +117,7 @@ def get_hub():
         hub = _threadlocal.hub = _threadlocal.Hub()
     return hub
 
+
 from eventlet import timeout
 
 
diff --git a/tox.ini b/tox.ini
index 24c6108..840582b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,6 +31,7 @@ deps =
     psycopg2cffi-compat==1.1
     pyopenssl==0.13
     pyzmq==13.1.0
+    setuptools==5.4.1
 commands =
     nosetests --verbose tests/
     nosetests --verbose --with-doctest eventlet/coros.py eventlet/event.py \