1

Author: dkropachev

.github/workflows/integration-tests.yml

@@ -28,7 +28,7 @@ jobs:
       matrix:
         java-version: [8]
         python-version: ["3.8", "3.11", "3.12", "3.13"]
-        event_loop_manager: ["libev", "asyncio", "asyncore"]
+        event_loop_manager: ["libev", "asyncio", "asyncore", "gevent", "eventlet"]
         exclude:
           - python-version: "3.12"
             event_loop_manager: "asyncore"

cassandra/cluster.py

@@ -117,10 +117,9 @@ def _is_gevent_monkey_patched():
     if 'gevent.monkey' not in sys.modules:
         return False
     try:
-        import eventlet.patcher
-        return eventlet.patcher.is_monkey_patched('socket')
-    # Another case related to PYTHON-1364
-    except AttributeError:
+        import gevent.socket
+        return socket.socket is gevent.socket.socket    # Another case related to PYTHON-1364
+    except (AttributeError, ImportError):
         return False
 
 def _try_gevent_import():

tests/__init__.py

@@ -61,13 +61,10 @@ def is_monkey_patched():
 thread_pool_executor_class = ThreadPoolExecutor
 
 if "gevent" in EVENT_LOOP_MANAGER:
-    try:
-        import gevent.monkey
-        gevent.monkey.patch_all()
-        from cassandra.io.geventreactor import GeventConnection
-        connection_class = GeventConnection
-    except ImportError:
-        connection_class = None
+    import gevent.monkey
+    gevent.monkey.patch_all()
+    from cassandra.io.geventreactor import GeventConnection
+    connection_class = GeventConnection
 elif "eventlet" in EVENT_LOOP_MANAGER:
     from eventlet import monkey_patch
     monkey_patch()
@@ -90,6 +87,9 @@ def is_monkey_patched():
 elif "asyncio" in EVENT_LOOP_MANAGER:
     from cassandra.io.asyncioreactor import AsyncioConnection
     connection_class = AsyncioConnection
+elif "libev" in EVENT_LOOP_MANAGER:
+    from cassandra.io.libevreactor import LibevConnection
+    connection_class = LibevConnection
 else:
     log.debug("Using default event loop (libev)")
     try: