driver-six-binary_and_text_data_removal

Author: vgali7

cassandra/auth.py

@@ -32,8 +32,6 @@
 except ImportError:
     SASLClient = None
 
-import six
-
 log = logging.getLogger(__name__)
 
 # Custom payload keys related to DSE Unified Auth
@@ -270,13 +268,13 @@ def __init__(self, username, password):
         self.password = password
 
     def get_mechanism(self):
-        return six.b("PLAIN")
+        return "PLAIN"
 
     def get_initial_challenge(self):
-        return six.b("PLAIN-START")
+        return "PLAIN-START"
 
     def evaluate_challenge(self, challenge):
-        if challenge == six.b('PLAIN-START'):
+        if challenge == 'PLAIN-START':
             data = "\x00%s\x00%s" % (self.username, self.password)
             return data.encode()
         raise Exception('Did not receive a valid challenge response from server')
@@ -297,13 +295,13 @@ def __init__(self, host, service, qops, properties):
         self.sasl = SASLClient(host, service, 'GSSAPI', qops=qops, **properties)
 
     def get_mechanism(self):
-        return six.b("GSSAPI")
+        return "GSSAPI"
 
     def get_initial_challenge(self):
-        return six.b("GSSAPI-START")
+        return "GSSAPI-START"
 
     def evaluate_challenge(self, challenge):
-        if challenge == six.b('GSSAPI-START'):
+        if challenge == 'GSSAPI-START':
             return self.sasl.process()
         else:
             return self.sasl.process(challenge)

cassandra/cluster.py

@@ -2673,7 +2673,7 @@ def execute_async(self, query, parameters=None, trace=False, custom_payload=None
         """
         custom_payload = custom_payload if custom_payload else {}
         if execute_as:
-            custom_payload[_proxy_execute_key] = six.b(execute_as)
+            custom_payload[_proxy_execute_key] = execute_as
 
         future = self._create_response_future(
             query, parameters, trace, custom_payload, timeout,
@@ -2737,7 +2737,7 @@ def execute_graph_async(self, query, parameters=None, trace=False, execution_pro
 
         custom_payload = execution_profile.graph_options.get_options_map()
         if execute_as:
-            custom_payload[_proxy_execute_key] = six.b(execute_as)
+            custom_payload[_proxy_execute_key] = execute_as
         custom_payload[_request_timeout_key] = int64_pack(long(execution_profile.request_timeout * 1000))
 
         future = self._create_response_future(query, parameters=None, trace=trace, custom_payload=custom_payload,

cassandra/datastax/graph/query.py

@@ -103,7 +103,7 @@ def get_options_map(self, other_options=None):
         for cl in ('graph-write-consistency', 'graph-read-consistency'):
             cl_enum = options.get(cl)
             if cl_enum is not None:
-                options[cl] = six.b(ConsistencyLevel.value_to_name[cl_enum])
+                options[cl] = ConsistencyLevel.value_to_name[cl_enum]
         return options
 
     def set_source_default(self):
@@ -158,7 +158,7 @@ def set(self, value, key=opt[2]):
         if value is not None:
             # normalize text here so it doesn't have to be done every time we get options map
             if isinstance(value, six.text_type) and not isinstance(value, six.binary_type):
-                value = six.b(value)
+                value = value
             self._graph_options[key] = value
         else:
             self._graph_options.pop(key, None)

cassandra/segment.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import zlib
-import six
 
 from cassandra import DriverException
 from cassandra.marshal import int32_pack

tests/integration/advanced/graph/test_graph.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
 import re
 
 from cassandra import OperationTimedOut, InvalidRequest

tests/integration/advanced/graph/test_graph_query.py

@@ -83,7 +83,7 @@ def test_consistency_passing(self):
             res = s.execute_graph("null")
 
             for k, v in cl.items():
-                self.assertEqual(res.response_future.message.custom_payload[graph_params[k]], six.b(ConsistencyLevel.value_to_name[v]))
+                self.assertEqual(res.response_future.message.custom_payload[graph_params[k]], ConsistencyLevel.value_to_name[v])
 
             # passed profile values override session defaults
             cl = {0: ConsistencyLevel.ALL, 1: ConsistencyLevel.QUORUM}
@@ -97,7 +97,7 @@ def test_consistency_passing(self):
             res = s.execute_graph("null", execution_profile=tmp_profile)
 
             for k, v in cl.items():
-                self.assertEqual(res.response_future.message.custom_payload[graph_params[k]], six.b(ConsistencyLevel.value_to_name[v]))
+                self.assertEqual(res.response_future.message.custom_payload[graph_params[k]], ConsistencyLevel.value_to_name[v])
         finally:
             default_profile.graph_options = default_graph_opts
 

tests/integration/cqlengine/columns/test_value_io.py

@@ -16,7 +16,6 @@
 from datetime import datetime, timedelta, time
 from decimal import Decimal
 from uuid import uuid1, uuid4, UUID
-import six
 
 from cassandra.cqlengine import columns
 from cassandra.cqlengine.management import sync_table
@@ -101,15 +100,15 @@ def test_column_io(self):
 class TestBlobIO(BaseColumnIOTest):
 
     column = columns.Blob
-    pkey_val = six.b('blake'), uuid4().bytes
-    data_val = six.b('eggleston'), uuid4().bytes
+    pkey_val = 'blake', uuid4().bytes
+    data_val = 'eggleston', uuid4().bytes
 
 
 class TestBlobIO2(BaseColumnIOTest):
 
     column = columns.Blob
-    pkey_val = bytearray(six.b('blake')), uuid4().bytes
-    data_val = bytearray(six.b('eggleston')), uuid4().bytes
+    pkey_val = bytearray('blake'), uuid4().bytes
+    data_val = bytearray('eggleston'), uuid4().bytes
 
 
 class TestTextIO(BaseColumnIOTest):

tests/integration/cqlengine/management/test_management.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 import unittest
 
-import six
 import mock
 import logging
 from packaging.version import Version

tests/integration/cqlengine/model/test_class_construction.py

@@ -15,7 +15,6 @@
 from uuid import uuid4
 import warnings
 
-import six
 from cassandra.cqlengine import columns, CQLEngineException
 from cassandra.cqlengine.models import Model, ModelException, ModelDefinitionException, ColumnQueryEvaluator
 from cassandra.cqlengine.query import ModelQuerySet, DMLQuery

tests/integration/cqlengine/test_batch_query.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 import warnings
 
-import six
 import sure
 
 from cassandra.cqlengine import columns

tests/integration/long/test_ipv6.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import os, socket, errno
-import six
 from ccmlib import common
 
 from cassandra.cluster import NoHostAvailable

tests/integration/simulacron/test_connection.py

@@ -14,7 +14,6 @@
 import unittest
 
 import logging
-import six
 import time
 
 from mock import Mock, patch

tests/integration/standard/test_authentication.py

@@ -16,7 +16,6 @@
 import logging
 import time
 
-import six
 from cassandra.cluster import NoHostAvailable
 from cassandra.auth import PlainTextAuthProvider, SASLClient, SaslAuthProvider
 

tests/integration/standard/test_client_warnings.py

@@ -15,7 +15,6 @@
 
 import unittest
 
-import six
 from cassandra.query import BatchStatement
 
 from tests.integration import use_singledc, PROTOCOL_VERSION, local, TestCluster

tests/integration/standard/test_cluster.py

@@ -23,7 +23,6 @@
 import warnings
 from packaging.version import Version
 
-import six
 import cassandra
 from cassandra.cluster import NoHostAvailable, ExecutionProfile, EXEC_PROFILE_DEFAULT, ControlConnection, Cluster
 from cassandra.concurrent import execute_concurrent

tests/integration/standard/test_custom_payload.py

@@ -15,8 +15,6 @@
 
 import unittest
 
-import six
-
 from cassandra.query import (SimpleStatement, BatchStatement, BatchType)
 
 from tests.integration import use_singledc, PROTOCOL_VERSION, local, TestCluster
@@ -138,16 +136,16 @@ def validate_various_custom_payloads(self, statement):
 
         # Long key value pair
         key_value = "x" * 10
-        custom_payload = {key_value: six.b(key_value)}
+        custom_payload = {key_value: key_value}
         self.execute_async_validate_custom_payload(statement=statement, custom_payload=custom_payload)
 
         # Max supported value key pairs according C* binary protocol v4 should be 65534 (unsigned short max value)
         for i in range(65534):
-            custom_payload[str(i)] = six.b('x')
+            custom_payload[str(i)] = 'x'
         self.execute_async_validate_custom_payload(statement=statement, custom_payload=custom_payload)
 
         # Add one custom payload to this is too many key value pairs and should fail
-        custom_payload[str(65535)] = six.b('x')
+        custom_payload[str(65535)] = 'x'
         with self.assertRaises(ValueError):
             self.execute_async_validate_custom_payload(statement=statement, custom_payload=custom_payload)
 

tests/integration/standard/test_metadata.py

@@ -990,7 +990,7 @@ class Ext1(Ext0):
         update_v = s.prepare('UPDATE system_schema.views SET extensions=? WHERE keyspace_name=? AND view_name=?')
         # extensions registered, one present
         # --------------------------------------
-        ext_map = {Ext0.name: six.b("THA VALUE")}
+        ext_map = {Ext0.name: "THA VALUE"}
         [(s.execute(update_t, (ext_map, ks, t)), s.execute(update_v, (ext_map, ks, v)))
          for _ in self.cluster.metadata.all_hosts()]  # we're manipulating metadata - do it on all hosts
         self.cluster.refresh_table_metadata(ks, t)
@@ -1012,8 +1012,8 @@ class Ext1(Ext0):
 
         # extensions registered, one present
         # --------------------------------------
-        ext_map = {Ext0.name: six.b("THA VALUE"),
-                   Ext1.name: six.b("OTHA VALUE")}
+        ext_map = {Ext0.name: "THA VALUE",
+                   Ext1.name: "OTHA VALUE"}
         [(s.execute(update_t, (ext_map, ks, t)), s.execute(update_v, (ext_map, ks, v)))
          for _ in self.cluster.metadata.all_hosts()]  # we're manipulating metadata - do it on all hosts
         self.cluster.refresh_table_metadata(ks, t)
@@ -1238,8 +1238,8 @@ def test_replicas(self):
 
         cluster.connect('test3rf')
 
-        self.assertNotEqual(list(cluster.metadata.get_replicas('test3rf', six.b('key'))), [])
-        host = list(cluster.metadata.get_replicas('test3rf', six.b('key')))[0]
+        self.assertNotEqual(list(cluster.metadata.get_replicas('test3rf', 'key')), [])
+        host = list(cluster.metadata.get_replicas('test3rf', 'key'))[0]
         self.assertEqual(host.datacenter, 'dc1')
         self.assertEqual(host.rack, 'r1')
         cluster.shutdown()

tests/integration/standard/test_udts.py

@@ -718,7 +718,7 @@ def test_type_alteration(self):
         s.execute("INSERT INTO %s (k, v) VALUES (0, {v0 : 3, v1 : 0xdeadbeef})" % (self.table_name,))
         val = s.execute('SELECT v FROM %s' % self.table_name)[0][0]
         self.assertEqual(val['v0'], 3)
-        self.assertEqual(val['v1'], six.b('\xde\xad\xbe\xef'))
+        self.assertEqual(val['v1'], '\xde\xad\xbe\xef')
 
     @lessthancass30
     def test_alter_udt(self):

tests/unit/advanced/cloud/test_cloud.py

@@ -9,7 +9,6 @@
 import tempfile
 import os
 import shutil
-import six
 
 import unittest
 

tests/unit/advanced/test_graph.py

@@ -17,8 +17,6 @@
 
 import unittest
 
-import six
-
 from cassandra import ConsistencyLevel
 from cassandra.policies import RetryPolicy
 from cassandra.graph import (SimpleGraphStatement, GraphOptions, GraphProtocol, Result,
@@ -278,7 +276,7 @@ def test_get_options(self):
         other = GraphOptions(**kwargs)
         options = base.get_options_map(other)
         updated = self.opt_mapping['graph_name']
-        self.assertEqual(options[updated], six.b('unit_test'))
+        self.assertEqual(options[updated], 'unit_test')
         for name in (n for n in self.opt_mapping.values() if n != updated):
             self.assertEqual(options[name], base._graph_options[name])
 
@@ -288,22 +286,22 @@ def test_get_options(self):
     def test_set_attr(self):
         expected = 'test@@@@'
         opts = GraphOptions(graph_name=expected)
-        self.assertEqual(opts.graph_name, six.b(expected))
+        self.assertEqual(opts.graph_name, expected)
         expected = 'somethingelse####'
         opts.graph_name = expected
-        self.assertEqual(opts.graph_name, six.b(expected))
+        self.assertEqual(opts.graph_name, expected)
 
         # will update options with set value
         another = GraphOptions()
         self.assertIsNone(another.graph_name)
         another.update(opts)
-        self.assertEqual(another.graph_name, six.b(expected))
+        self.assertEqual(another.graph_name, expected)
 
         opts.graph_name = None
         self.assertIsNone(opts.graph_name)
         # will not update another with its set-->unset value
         another.update(opts)
-        self.assertEqual(another.graph_name, six.b(expected))  # remains unset
+        self.assertEqual(another.graph_name, expected)  # remains unset
         opt_map = another.get_options_map(opts)
         self.assertEqual(opt_map, another._graph_options)
 
@@ -318,7 +316,7 @@ def _verify_api_params(self, opts, api_params):
         self.assertEqual(len(opts._graph_options), len(api_params))
         for name, value in api_params.items():
             try:
-                value = six.b(value)
+                value = value
             except:
                 pass  # already bytes
             self.assertEqual(getattr(opts, name), value)
@@ -335,8 +333,8 @@ def test_consistency_levels(self):
 
         # mapping from base
         opt_map = opts.get_options_map()
-        self.assertEqual(opt_map['graph-read-consistency'], six.b(ConsistencyLevel.value_to_name[read_cl]))
-        self.assertEqual(opt_map['graph-write-consistency'], six.b(ConsistencyLevel.value_to_name[write_cl]))
+        self.assertEqual(opt_map['graph-read-consistency'], ConsistencyLevel.value_to_name[read_cl])
+        self.assertEqual(opt_map['graph-write-consistency'], ConsistencyLevel.value_to_name[write_cl])
 
         # empty by default
         new_opts = GraphOptions()
@@ -346,8 +344,8 @@ def test_consistency_levels(self):
 
         # set from other
         opt_map = new_opts.get_options_map(opts)
-        self.assertEqual(opt_map['graph-read-consistency'], six.b(ConsistencyLevel.value_to_name[read_cl]))
-        self.assertEqual(opt_map['graph-write-consistency'], six.b(ConsistencyLevel.value_to_name[write_cl]))
+        self.assertEqual(opt_map['graph-read-consistency'], ConsistencyLevel.value_to_name[read_cl])
+        self.assertEqual(opt_map['graph-write-consistency'], ConsistencyLevel.value_to_name[write_cl])
 
     def test_graph_source_convenience_attributes(self):
         opts = GraphOptions()

tests/unit/cqlengine/test_connection.py

@@ -14,8 +14,6 @@
 
 import unittest
 
-import six
-
 from cassandra.cluster import _ConfigMode
 from cassandra.cqlengine import connection
 from cassandra.query import dict_factory