Removed unused parameters from PreparedStatement init

aholmberg · aholmberg · commit f5d5f905e7cb · 2015-04-16T15:34:42.000-05:00
diff --git a/cassandra/query.py b/cassandra/query.py
@@ -338,19 +338,14 @@ class PreparedStatement(object):
 
     fetch_size = FETCH_SIZE_UNSET
 
-    def __init__(self, column_metadata, query_id, routing_key_indexes, query, keyspace,
-                 protocol_version, consistency_level=None, serial_consistency_level=None,
-                 fetch_size=FETCH_SIZE_UNSET):
+    def __init__(self, column_metadata, query_id, routing_key_indexes, query,
+                 keyspace, protocol_version):
         self.column_metadata = column_metadata
         self.query_id = query_id
         self.routing_key_indexes = routing_key_indexes
         self.query_string = query
         self.keyspace = keyspace
         self.protocol_version = protocol_version
-        self.consistency_level = consistency_level
-        self.serial_consistency_level = serial_consistency_level
-        if fetch_size is not FETCH_SIZE_UNSET:
-            self.fetch_size = fetch_size
 
     @classmethod
     def from_message(cls, query_id, column_metadata, pk_indexes, cluster_metadata, query, prepared_keyspace, protocol_version):
diff --git a/tests/unit/test_parameter_binding.py b/tests/unit/test_parameter_binding.py
@@ -128,8 +128,8 @@ def test_inherit_fetch_size(self):
                                                routing_key_indexes=[],
                                                query=None,
                                                keyspace=keyspace,
-                                               protocol_version=2,
-                                               fetch_size=1234)
+                                               protocol_version=2)
+        prepared_statement.fetch_size = 1234
         bound_statement = BoundStatement(prepared_statement=prepared_statement)
         self.assertEqual(1234, bound_statement.fetch_size)
 
@@ -147,10 +147,9 @@ def test_too_few_parameters_for_key(self):
                                                routing_key_indexes=[0, 1],
                                                query=None,
                                                keyspace=keyspace,
-                                               protocol_version=2,
-                                               fetch_size=1234)
+                                               protocol_version=2)
 
         self.assertRaises(ValueError, prepared_statement.bind, (1,))
 
-        bound = prepared_statement.bind((1,2))
+        bound = prepared_statement.bind((1, 2))
         self.assertEqual(bound.keyspace, keyspace)
