Rename cassandra.decoder to cassandra.protocol

cassandra/cluster.py

@@ -44,17 +44,17 @@ from itertools import groupby
 from cassandra import (ConsistencyLevel, AuthenticationFailed,
                        OperationTimedOut, UnsupportedOperation)
 from cassandra.connection import ConnectionException, ConnectionShutdown
-from cassandra.decoder import (QueryMessage, ResultMessage,
-                               ErrorMessage, ReadTimeoutErrorMessage,
-                               WriteTimeoutErrorMessage,
-                               UnavailableErrorMessage,
-                               OverloadedErrorMessage,
-                               PrepareMessage, ExecuteMessage,
-                               PreparedQueryNotFound,
-                               IsBootstrappingErrorMessage,
-                               BatchMessage, RESULT_KIND_PREPARED,
-                               RESULT_KIND_SET_KEYSPACE, RESULT_KIND_ROWS,
-                               RESULT_KIND_SCHEMA_CHANGE)
+from cassandra.protocol import (QueryMessage, ResultMessage,
+                                ErrorMessage, ReadTimeoutErrorMessage,
+                                WriteTimeoutErrorMessage,
+                                UnavailableErrorMessage,
+                                OverloadedErrorMessage,
+                                PrepareMessage, ExecuteMessage,
+                                PreparedQueryNotFound,
+                                IsBootstrappingErrorMessage,
+                                BatchMessage, RESULT_KIND_PREPARED,
+                                RESULT_KIND_SET_KEYSPACE, RESULT_KIND_ROWS,
+                                RESULT_KIND_SCHEMA_CHANGE)
 from cassandra.metadata import Metadata, protect_name
 from cassandra.policies import (RoundRobinPolicy, SimpleConvictionPolicy,
                                 ExponentialReconnectionPolicy, HostDistance,

cassandra/connection.py

@@ -29,10 +29,10 @@ from six.moves import range
 
 from cassandra import ConsistencyLevel, AuthenticationFailed, OperationTimedOut
 from cassandra.marshal import int32_pack, header_unpack
-from cassandra.decoder import (ReadyMessage, AuthenticateMessage, OptionsMessage,
-                               StartupMessage, ErrorMessage, CredentialsMessage,
-                               QueryMessage, ResultMessage, decode_response,
-                               InvalidRequestException, SupportedMessage)
+from cassandra.protocol import (ReadyMessage, AuthenticateMessage, OptionsMessage,
+                                StartupMessage, ErrorMessage, CredentialsMessage,
+                                QueryMessage, ResultMessage, decode_response,
+                                InvalidRequestException, SupportedMessage)
 import six
 
 

cassandra/io/asyncorereactor.py

@@ -40,7 +40,7 @@ except ImportError:
 from cassandra import OperationTimedOut
 from cassandra.connection import (Connection, ConnectionShutdown,
                                   ConnectionException, NONBLOCKING)
-from cassandra.decoder import RegisterMessage
+from cassandra.protocol import RegisterMessage
 from cassandra.marshal import int32_unpack
 
 log = logging.getLogger(__name__)

cassandra/io/geventreactor.py

@@ -31,7 +31,7 @@ from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, EINVAL
 
 from cassandra import OperationTimedOut
 from cassandra.connection import Connection, ConnectionShutdown
-from cassandra.decoder import RegisterMessage
+from cassandra.protocol import RegisterMessage
 from cassandra.marshal import int32_unpack
 
 

cassandra/io/libevreactor.py

@@ -24,7 +24,7 @@ from six import BytesIO
 
 from cassandra import OperationTimedOut
 from cassandra.connection import Connection, ConnectionShutdown, NONBLOCKING
-from cassandra.decoder import RegisterMessage
+from cassandra.protocol import RegisterMessage
 from cassandra.marshal import int32_unpack
 try:
     import cassandra.io.libevwrapper as libev

tests/integration/standard/test_connection.py

@@ -26,7 +26,7 @@ from threading import Thread, Event
 
 from cassandra import ConsistencyLevel, OperationTimedOut
 from cassandra.cluster import NoHostAvailable
-from cassandra.decoder import QueryMessage
+from cassandra.protocol import QueryMessage
 from cassandra.io.asyncorereactor import AsyncoreConnection
 
 try:

tests/unit/io/test_asyncorereactor.py

@@ -31,8 +31,8 @@ from mock import patch, Mock
 from cassandra.connection import (HEADER_DIRECTION_TO_CLIENT,
                                   ConnectionException)
 
-from cassandra.decoder import (write_stringmultimap, write_int, write_string,
-                               SupportedMessage, ReadyMessage, ServerError)
+from cassandra.protocol import (write_stringmultimap, write_int, write_string,
+                                SupportedMessage, ReadyMessage, ServerError)
 from cassandra.marshal import uint8_pack, uint32_pack, int32_pack
 
 from cassandra.io.asyncorereactor import AsyncoreConnection

tests/unit/io/test_libevreactor.py

@@ -29,8 +29,8 @@ from mock import patch, Mock
 from cassandra.connection import (HEADER_DIRECTION_TO_CLIENT,
                                   ConnectionException)
 
-from cassandra.decoder import (write_stringmultimap, write_int, write_string,
-                               SupportedMessage, ReadyMessage, ServerError)
+from cassandra.protocol import (write_stringmultimap, write_int, write_string,
+                                SupportedMessage, ReadyMessage, ServerError)
 from cassandra.marshal import uint8_pack, uint32_pack, int32_pack
 
 try:

tests/unit/test_connection.py

@@ -25,8 +25,8 @@ from mock import Mock, ANY
 from cassandra.cluster import Cluster
 from cassandra.connection import (Connection, HEADER_DIRECTION_TO_CLIENT,
                                   HEADER_DIRECTION_FROM_CLIENT, ProtocolError)
-from cassandra.decoder import (write_stringmultimap, write_int, write_string,
-                               SupportedMessage)
+from cassandra.protocol import (write_stringmultimap, write_int, write_string,
+                                SupportedMessage)
 from cassandra.marshal import uint8_pack, uint32_pack
 
 

tests/unit/test_control_connection.py

@@ -22,7 +22,7 @@ from mock import Mock, ANY
 from concurrent.futures import ThreadPoolExecutor
 
 from cassandra import OperationTimedOut
-from cassandra.decoder import ResultMessage, RESULT_KIND_ROWS
+from cassandra.protocol import ResultMessage, RESULT_KIND_ROWS
 from cassandra.cluster import ControlConnection, Cluster, _Scheduler
 from cassandra.pool import Host
 from cassandra.policies import (SimpleConvictionPolicy, RoundRobinPolicy,

tests/unit/test_response_future.py

@@ -22,12 +22,12 @@ from mock import Mock, MagicMock, ANY
 from cassandra import ConsistencyLevel
 from cassandra.cluster import Session, ResponseFuture, NoHostAvailable
 from cassandra.connection import ConnectionException
-from cassandra.decoder import (ReadTimeoutErrorMessage, WriteTimeoutErrorMessage,
-                               UnavailableErrorMessage, ResultMessage, QueryMessage,
-                               OverloadedErrorMessage, IsBootstrappingErrorMessage,
-                               PreparedQueryNotFound, PrepareMessage,
-                               RESULT_KIND_ROWS, RESULT_KIND_SET_KEYSPACE,
-                               RESULT_KIND_SCHEMA_CHANGE)
+from cassandra.protocol import (ReadTimeoutErrorMessage, WriteTimeoutErrorMessage,
+                                UnavailableErrorMessage, ResultMessage, QueryMessage,
+                                OverloadedErrorMessage, IsBootstrappingErrorMessage,
+                                PreparedQueryNotFound, PrepareMessage,
+                                RESULT_KIND_ROWS, RESULT_KIND_SET_KEYSPACE,
+                                RESULT_KIND_SCHEMA_CHANGE)
 from cassandra.policies import RetryPolicy
 from cassandra.pool import NoConnectionsAvailable
 from cassandra.query import SimpleStatement

tests/unit/test_types.py

@@ -26,8 +26,9 @@ from cassandra.cqltypes import (BooleanType, lookup_casstype_simple, lookup_cass
                                 CassandraType, UTF8Type, parse_casstype_args,
                                 EmptyValue, _CassandraType, DateType)
 from cassandra.query import named_tuple_factory
-from cassandra.decoder import (write_string, read_longstring, write_stringmap, read_stringmap, read_inet,
-                               write_inet, read_string, write_longstring)
+from cassandra.protocol import (write_string, read_longstring, write_stringmap,
+                                read_stringmap, read_inet, write_inet,
+                                read_string, write_longstring)
 from cassandra.encoder import cql_quote