Clean up cluster.py imports

cassandra/cluster.py

@@ -1,22 +1,26 @@
+from functools import partial
+from futures import ThreadPoolExecutor
+import logging
 import time
 from threading import Lock, RLock, Thread, Event
-import Queue
-import logging
 import traceback
+import Queue
 
-from futures import ThreadPoolExecutor
+from cassandra.connection import Connection
-
+from cassandra.decoder import (ConsistencyLevel, QueryMessage, ResultMessage,
-from connection import Connection
+                               ErrorMessage, ReadTimeoutErrorMessage,
-from decoder import (ConsistencyLevel, QueryMessage, ResultMessage, ErrorMessage,
+                               WriteTimeoutErrorMessage,
-                     ReadTimeoutErrorMessage, WriteTimeoutErrorMessage, UnavailableExceptionErrorMessage,
+                               UnavailableExceptionErrorMessage,
-                     OverloadedErrorMessage, IsBootstrappingErrorMessage)
+                               OverloadedErrorMessage,
-from metadata import Metadata
+                               IsBootstrappingErrorMessage)
-from policies import (RoundRobinPolicy, SimpleConvictionPolicy,
+from cassandra.metadata import Metadata
-                      ExponentialReconnectionPolicy, HostDistance, RetryPolicy)
+from cassandra.policies import (RoundRobinPolicy, SimpleConvictionPolicy,
-from query import SimpleStatement
+                                ExponentialReconnectionPolicy, HostDistance,
-from pool import (ConnectionException,
+                                RetryPolicy)
-                  AuthenticationException, _ReconnectionHandler,
+from cassandra.query import SimpleStatement
-                  _HostReconnectionHandler, HostConnectionPool)
+from cassandra.pool import (ConnectionException,
+                            AuthenticationException, _ReconnectionHandler,
+                            _HostReconnectionHandler, HostConnectionPool)
 
 # TODO: we might want to make this configurable
 MAX_SCHEMA_AGREEMENT_WAIT = 10