1

Author: dkropachev

cassandra/cluster.py

@@ -103,7 +103,7 @@
 
 try:
     from cassandra.io.eventletreactor import EventletConnection
-except (ImportError, AttributeError):
+except DependencyException:
     # AttributeError was add for handling python 3.12 https://github.com/eventlet/eventlet/issues/812
     # TODO: remove it when eventlet issue would be fixed
     EventletConnection = None
@@ -153,11 +153,13 @@ def _is_gevent_monkey_patched():
 
 
 def _try_eventlet_import():
-    if _is_eventlet_monkey_patched():
+    try:
         from cassandra.io.eventletreactor import EventletConnection
-        return (EventletConnection,None)
-    else:
-        return (None,None)
+    except DependencyException as e:
+        return None, e
+    if _is_eventlet_monkey_patched():
+        return EventletConnection, None
+    return None, DependencyException("eventlet is not patched")
 
 def _try_libev_import():
     try:
@@ -209,7 +211,7 @@ def get_default_connection_class():
         conn, exc = try_fn()
         if conn is not None:
             return conn, None
-        else:
+        if exc:
             excs.append(exc)
     return None, tuple(excs)
 

cassandra/concurrent.py renamed to cassandra/concurrent_executor.py

@@ -33,11 +33,11 @@
 from cassandra import DependencyException
 try:
     import asyncore
-except ModuleNotFoundError:
+except ModuleNotFoundError as e:
     raise DependencyException(
         "Unable to import asyncore module.  Note that this module has been removed in Python 3.12 "
         "so when using the driver with this version (or anything newer) you will need to use one of the "
-        "other event loop implementations."
+        "other event loop implementations. Exception: %s" % str(e)
     )
 
 from cassandra.connection import Connection, ConnectionShutdown, NONBLOCKING, Timer, TimerManager

cassandra/io/asyncorereactor.py

@@ -15,10 +15,20 @@
 
 # Originally derived from MagnetoDB source:
 #   https://github.com/stackforge/magnetodb/blob/2015.1.0b1/magnetodb/common/cassandra/io/eventletreactor.py
-import eventlet
-from eventlet.green import socket
-from eventlet.queue import Queue
-from greenlet import GreenletExit
+from cassandra import DependencyException
+
+try:
+    import eventlet
+    from eventlet.green import socket
+    from eventlet.queue import Queue
+except (ModuleNotFoundError, ImportError, AttributeError):
+    raise DependencyException("Unable to import eventlet module. Try to install it via `pip install eventlet`")
+
+try:
+    from greenlet import GreenletExit
+except (ModuleNotFoundError, ImportError, AttributeError):
+    raise DependencyException("Unable to import greenlet module. Try to install it via `pip install greenlet`")
+
 import logging
 from threading import Event
 import time

cassandra/io/eventletreactor.py

@@ -25,7 +25,7 @@
 import time
 
 from cassandra.cluster import ExecutionProfile, ContinuousPagingOptions
-from cassandra.concurrent import execute_concurrent
+from cassandra.concurrent_executor import execute_concurrent
 from cassandra.query import SimpleStatement
 
 

tests/integration/advanced/test_cont_paging.py

@@ -19,7 +19,7 @@
 from cassandra.cqlengine.named import NamedKeyspace
 from cassandra.cqlengine.operators import EqualsOperator, GreaterThanOrEqualOperator
 from cassandra.cqlengine.query import ResultObject
-from cassandra.concurrent import execute_concurrent_with_args
+from cassandra.concurrent_executor import execute_concurrent_with_args
 from cassandra.cqlengine import models
 
 from tests.integration.cqlengine import setup_connection, execute_count

tests/integration/cqlengine/query/test_named.py

@@ -26,7 +26,7 @@
     FunctionFailure, ProtocolVersion,
 )
 from cassandra.cluster import ExecutionProfile, EXEC_PROFILE_DEFAULT
-from cassandra.concurrent import execute_concurrent_with_args
+from cassandra.concurrent_executor import execute_concurrent_with_args
 from cassandra.query import SimpleStatement
 from tests.integration import (
     use_singledc, PROTOCOL_VERSION, get_cluster, setup_keyspace, remove_cluster,

tests/integration/long/test_failure_types.py

@@ -21,7 +21,7 @@
 from cassandra import ConsistencyLevel, Unavailable, OperationTimedOut, ReadTimeout, ReadFailure, \
     WriteTimeout, WriteFailure
 from cassandra.cluster import NoHostAvailable, ExecutionProfile, EXEC_PROFILE_DEFAULT
-from cassandra.concurrent import execute_concurrent_with_args
+from cassandra.concurrent_executor import execute_concurrent_with_args
 from cassandra.metadata import murmur3
 from cassandra.policies import (
     RoundRobinPolicy, DCAwareRoundRobinPolicy,

tests/integration/long/test_loadbalancingpolicies.py

@@ -27,7 +27,7 @@
 
 import cassandra
 from cassandra.cluster import NoHostAvailable, ExecutionProfile, EXEC_PROFILE_DEFAULT, ControlConnection, Cluster
-from cassandra.concurrent import execute_concurrent
+from cassandra.concurrent_executor import execute_concurrent
 from cassandra.policies import (RoundRobinPolicy, ExponentialReconnectionPolicy,
                                 RetryPolicy, SimpleConvictionPolicy, HostDistance,
                                 AddressTranslator, TokenAwarePolicy, HostFilterPolicy)

tests/integration/standard/test_cluster.py

@@ -18,7 +18,7 @@
 from cassandra import InvalidRequest, ConsistencyLevel, ReadTimeout, WriteTimeout, OperationTimedOut, \
     ReadFailure, WriteFailure
 from cassandra.cluster import ExecutionProfile, EXEC_PROFILE_DEFAULT
-from cassandra.concurrent import execute_concurrent, execute_concurrent_with_args, ExecutionResult
+from cassandra.concurrent_executor import execute_concurrent, execute_concurrent_with_args, ExecutionResult
 from cassandra.policies import HostDistance
 from cassandra.query import dict_factory, tuple_factory, SimpleStatement
 

tests/integration/standard/test_concurrent.py

@@ -7,7 +7,7 @@
 from itertools import count
 
 from cassandra.cluster import ExecutionProfile, EXEC_PROFILE_DEFAULT
-from cassandra.concurrent import execute_concurrent_with_args
+from cassandra.concurrent_executor import execute_concurrent_with_args
 from cassandra.cython_deps import HAVE_CYTHON, HAVE_NUMPY
 from cassandra.protocol import ProtocolHandler, LazyProtocolHandler, NumpyProtocolHandler
 from cassandra.query import tuple_factory

tests/integration/standard/test_cython_protocol_handlers.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import os
-from cassandra.concurrent import execute_concurrent
+from cassandra.concurrent_executor import execute_concurrent
 from cassandra import DriverException
 
 import unittest

tests/integration/standard/test_query.py

@@ -23,7 +23,7 @@
 
 from cassandra import ConsistencyLevel
 from cassandra.cluster import EXEC_PROFILE_DEFAULT, ExecutionProfile
-from cassandra.concurrent import execute_concurrent, execute_concurrent_with_args
+from cassandra.concurrent_executor import execute_concurrent, execute_concurrent_with_args
 from cassandra.policies import HostDistance
 from cassandra.query import SimpleStatement
 

tests/integration/standard/test_query_paging.py

@@ -23,7 +23,7 @@
 from cassandra import InvalidRequest
 from cassandra import util
 from cassandra.cluster import ExecutionProfile, EXEC_PROFILE_DEFAULT
-from cassandra.concurrent import execute_concurrent_with_args
+from cassandra.concurrent_executor import execute_concurrent_with_args
 from cassandra.cqltypes import Int32Type, EMPTY
 from cassandra.query import dict_factory, ordered_dict_factory
 from cassandra.util import sortedset, Duration, OrderedMap

tests/integration/standard/test_types.py

@@ -16,13 +16,14 @@
 import unittest
 from mock import patch
 
+from cassandra import DependencyException
 from tests.unit.io.utils import TimerTestMixin
 from tests import notpypy, EVENT_LOOP_MANAGER
 
 try:
     from eventlet import monkey_patch
     from cassandra.io.eventletreactor import EventletConnection
-except (ImportError, AttributeError):
+except (ImportError, AttributeError, DependencyException):
     EventletConnection = None  # noqa
 
 skip_condition = EventletConnection is None or EVENT_LOOP_MANAGER != "eventlet"

tests/unit/io/test_eventletreactor.py

@@ -24,7 +24,7 @@
 import platform
 
 from cassandra.cluster import Cluster, Session
-from cassandra.concurrent import execute_concurrent, execute_concurrent_with_args
+from cassandra.concurrent_executor import execute_concurrent, execute_concurrent_with_args
 from cassandra.pool import Host
 from cassandra.policies import SimpleConvictionPolicy
 from tests.unit.utils import mock_session_pools