From f5d5f905e7cb7db97b4c06cbd314728c2acf410b Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Thu, 16 Apr 2015 15:34:42 -0500 Subject: [PATCH] Removed unused parameters from PreparedStatement init --- cassandra/query.py | 9 ++------- tests/unit/test_parameter_binding.py | 9 ++++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/cassandra/query.py b/cassandra/query.py index fc71b8f6..031a1684 100644 --- 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 index f649c520..3fce7b9e 100644 --- a/tests/unit/test_parameter_binding.py +++ b/tests/unit/test_parameter_binding.py @@ -128,8 +128,8 @@ class BoundStatementTestCase(unittest.TestCase): 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 @@ class BoundStatementTestCase(unittest.TestCase): 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)