1 files changed, 31 insertions, 16 deletions
diff --git a/lib/sqlalchemy/util/concurrency.py b/lib/sqlalchemy/util/concurrency.py
index e0883aa68..f78c0971c 100644
--- a/lib/sqlalchemy/util/concurrency.py
+++ b/lib/sqlalchemy/util/concurrency.py
@@ -1,25 +1,40 @@
 from . import compat
 
+have_greenlet = False
 
 if compat.py3k:
-    import asyncio
-    from ._concurrency_py3k import await_only
-    from ._concurrency_py3k import await_fallback
-    from ._concurrency_py3k import greenlet
-    from ._concurrency_py3k import greenlet_spawn
-    from ._concurrency_py3k import AsyncAdaptedLock
-else:
-    asyncio = None
-    greenlet = None
-
-    def await_only(thing):
+    try:
+        import greenlet  # noqa F401
+    except ImportError:
+        pass
+    else:
+        have_greenlet = True
+        from ._concurrency_py3k import await_only
+        from ._concurrency_py3k import await_fallback
+        from ._concurrency_py3k import greenlet_spawn
+        from ._concurrency_py3k import AsyncAdaptedLock
+        from ._concurrency_py3k import asyncio  # noqa F401
+
+if not have_greenlet:
+
+    asyncio = None  # noqa F811
+
+    def _not_implemented():
+        if not compat.py3k:
+            raise ValueError("Cannot use this function in py2.")
+        else:
+            raise ValueError(
+                "the greenlet library is required to use this function."
+            )
+
+    def await_only(thing):  # noqa F811
         return thing
 
-    def await_fallback(thing):
+    def await_fallback(thing):  # noqa F81
         return thing
 
-    def greenlet_spawn(fn, *args, **kw):
-        raise ValueError("Cannot use this function in py2.")
+    def greenlet_spawn(fn, *args, **kw):  # noqa F81
+        _not_implemented()
 
-    def AsyncAdaptedLock(*args, **kw):
-        raise ValueError("Cannot use this function in py2.")
+    def AsyncAdaptedLock(*args, **kw):  # noqa F81
+        _not_implemented()