diff --git a/cassandra/cluster.py b/cassandra/cluster.py index e25c9826..87499765 100644 --- a/cassandra/cluster.py +++ b/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, diff --git a/cassandra/connection.py b/cassandra/connection.py index 641b58f7..f93f6957 100644 --- a/cassandra/connection.py +++ b/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 diff --git a/cassandra/io/asyncorereactor.py b/cassandra/io/asyncorereactor.py index 658318f1..14aace28 100644 --- a/cassandra/io/asyncorereactor.py +++ b/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__) diff --git a/cassandra/io/geventreactor.py b/cassandra/io/geventreactor.py index d9e8ddc1..cefe4b8e 100644 --- a/cassandra/io/geventreactor.py +++ b/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 diff --git a/cassandra/io/libevreactor.py b/cassandra/io/libevreactor.py index f1c7180b..44afce69 100644 --- a/cassandra/io/libevreactor.py +++ b/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 diff --git a/cassandra/decoder.py b/cassandra/protocol.py similarity index 100% rename from cassandra/decoder.py rename to cassandra/protocol.py diff --git a/tests/integration/standard/test_connection.py b/tests/integration/standard/test_connection.py index ecf70399..79b0fde1 100644 --- a/tests/integration/standard/test_connection.py +++ b/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: diff --git a/tests/unit/io/test_asyncorereactor.py b/tests/unit/io/test_asyncorereactor.py index 848fb2dd..179fe637 100644 --- a/tests/unit/io/test_asyncorereactor.py +++ b/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 diff --git a/tests/unit/io/test_libevreactor.py b/tests/unit/io/test_libevreactor.py index be6dabac..27772f9e 100644 --- a/tests/unit/io/test_libevreactor.py +++ b/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: diff --git a/tests/unit/test_connection.py b/tests/unit/test_connection.py index a698204c..3d3f61aa 100644 --- a/tests/unit/test_connection.py +++ b/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 diff --git a/tests/unit/test_control_connection.py b/tests/unit/test_control_connection.py index 1635dbae..e552c8e3 100644 --- a/tests/unit/test_control_connection.py +++ b/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, diff --git a/tests/unit/test_response_future.py b/tests/unit/test_response_future.py index 53f3fa1f..e9e0b686 100644 --- a/tests/unit/test_response_future.py +++ b/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 diff --git a/tests/unit/test_types.py b/tests/unit/test_types.py index fd0f11a4..773653f6 100644 --- a/tests/unit/test_types.py +++ b/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