Review and lint comments for oss-next

Author: TheRealFalcon

build.yaml

@@ -179,7 +179,7 @@ cassandra:
 env:
   CYTHON:
     - CYTHON
-#    - NO_CYTHON
+    - NO_CYTHON
 
 build:
   - script: |

cassandra/auth.py

@@ -150,8 +150,8 @@ class TransitionalModePlainTextAuthProvider(object):
         auth_provider = TransitionalModePlainTextAuthProvider()
         cluster = Cluster(auth_provider=auth_provider)
 
-    .. warning:: TransitionalModePlainTextAuthProvider will be removed in dse-driver
-                 3.0. The transitional mode will be handled internally without the need
+    .. warning:: TransitionalModePlainTextAuthProvider will be removed in cassandra-driver
+                 4.0. The transitional mode will be handled internally without the need
                  of any auth provider.
     """
 

cassandra/cluster.py

@@ -446,7 +446,7 @@ def __init__(self, load_balancing_policy=None, retry_policy=None,
         See also :class:`~.GraphExecutionPolicy`.
 
         In addition to default parameters shown in the signature, this profile also defaults ``retry_policy`` to
-        :class:`dse.policies.NeverRetryPolicy`, and ``load_balancing_policy`` to one that targets the current Spark
+        :class:`cassandra.policies.NeverRetryPolicy`, and ``load_balancing_policy`` to one that targets the current Spark
         master.
 
         Note: The graph_options.graph_source is set automatically to b'a' (analytics)

tests/integration/advanced/__init__.py

@@ -33,7 +33,7 @@
 from cassandra.cluster import Cluster, EXEC_PROFILE_GRAPH_DEFAULT, EXEC_PROFILE_GRAPH_ANALYTICS_DEFAULT
 
 from tests.integration import PROTOCOL_VERSION, DSE_VERSION, get_server_versions, BasicKeyspaceUnitTestCase, \
-    drop_keyspace_shutdown_cluster, get_node, USE_CASS_EXTERNAL, CASSANDRA_IP
+    drop_keyspace_shutdown_cluster, get_node, USE_CASS_EXTERNAL, CASSANDRA_IP, set_default_cass_ip
 from tests.integration import use_singledc, use_single_node, wait_for_node_socket
 from cassandra.protocol import ServerError
 from cassandra.util import Point, LineString, Polygon
@@ -216,7 +216,7 @@ def use_cluster_with_graph(num_nodes):
     when started all at once.
     """
     if USE_CASS_EXTERNAL:
-        set_default_dse_ip()
+        set_default_cass_ip()
         return
 
     # Create the cluster but don't start it.
@@ -705,4 +705,4 @@ def validate_path_result_type(test, path):
         elif isinstance(obj, Vertex):
             validate_classic_vertex(test, obj)
         else:
-            test.fail("Invalid object found in path " + str(object.type))
+            test.fail("Invalid object found in path " + str(obj.type))

tests/integration/advanced/graph/fluent/test_graph.py

@@ -468,7 +468,7 @@ def _validate_path_result_type(self, g, objects_path):
             elif isinstance(obj, TravVertex):
                 self._validate_classic_vertex(g, obj)
             else:
-                self.fail("Invalid object found in path " + str(object.type))
+                self.fail("Invalid object found in path " + str(obj.type))
 
     def _validate_meta_property(self, g, vertex):
         meta_props =  g.V(vertex.id).properties().toList()