openstack/deb-python-cassandra-driver
Code Issues Proposed changes

tighten up whitespace in collection cql encoders

Browse Source
This commit is contained in:
Adam Holmberg
2015-11-04 12:34:02 -06:00
parent 5efef30139
commit 4ea3c72d80
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cassandra/encoder.py
View File

@@ -187,7 +187,7 @@ class Encoder(object):
Converts a sequence to a string of the form ``(item1, item2, ...)``. This Converts a sequence to a string of the form ``(item1, item2, ...)``. This
is suitable for ``IN`` value lists. is suitable for ``IN`` value lists.
""" """
return '( %s )' % ' , '.join(self.mapping.get(type(v), self.cql_encode_object)(v) return '(%s)' % ', '.join(self.mapping.get(type(v), self.cql_encode_object)(v)
for v in val) for v in val)
cql_encode_tuple = cql_encode_sequence cql_encode_tuple = cql_encode_sequence
@@ -201,7 +201,7 @@ class Encoder(object):
Converts a dict into a string of the form ``{key1: val1, key2: val2, ...}``. Converts a dict into a string of the form ``{key1: val1, key2: val2, ...}``.
This is suitable for ``map`` type columns. This is suitable for ``map`` type columns.
""" """
return '{ %s }' % ' , '.join('%s : %s' % ( return '{%s}' % ', '.join('%s: %s' % (
self.mapping.get(type(k), self.cql_encode_object)(k), self.mapping.get(type(k), self.cql_encode_object)(k),
self.mapping.get(type(v), self.cql_encode_object)(v) self.mapping.get(type(v), self.cql_encode_object)(v)
) for k, v in six.iteritems(val)) ) for k, v in six.iteritems(val))
@@ -211,14 +211,14 @@ class Encoder(object):
Converts a sequence to a string of the form ``[item1, item2, ...]``. This Converts a sequence to a string of the form ``[item1, item2, ...]``. This
is suitable for ``list`` type columns. is suitable for ``list`` type columns.
""" """
return '[ %s ]' % ' , '.join(self.mapping.get(type(v), self.cql_encode_object)(v) for v in val) return '[%s]' % ', '.join(self.mapping.get(type(v), self.cql_encode_object)(v) for v in val)
def cql_encode_set_collection(self, val): def cql_encode_set_collection(self, val):
""" """
Converts a sequence to a string of the form ``{item1, item2, ...}``. This Converts a sequence to a string of the form ``{item1, item2, ...}``. This
is suitable for ``set`` type columns. is suitable for ``set`` type columns.
""" """
return '{ %s }' % ' , '.join(self.mapping.get(type(v), self.cql_encode_object)(v) for v in val) return '{%s}' % ', '.join(self.mapping.get(type(v), self.cql_encode_object)(v) for v in val)
def cql_encode_all_types(self, val): def cql_encode_all_types(self, val):
""" """

10
tests/unit/test_parameter_binding.py
View File

@@ -40,11 +40,11 @@ class ParamBindingTest(unittest.TestCase):
def test_sequence_param(self): def test_sequence_param(self):
result = bind_params("%s", (ValueSequence((1, "a", 2.0)),), Encoder()) result = bind_params("%s", (ValueSequence((1, "a", 2.0)),), Encoder())
self.assertEqual(result, "( 1 , 'a' , 2.0 )") self.assertEqual(result, "(1, 'a', 2.0)")
def test_generator_param(self): def test_generator_param(self):
result = bind_params("%s", ((i for i in xrange(3)),), Encoder()) result = bind_params("%s", ((i for i in xrange(3)),), Encoder())
self.assertEqual(result, "[ 0 , 1 , 2 ]") self.assertEqual(result, "[0, 1, 2]")
def test_none_param(self): def test_none_param(self):
result = bind_params("%s", (None,), Encoder()) result = bind_params("%s", (None,), Encoder())
@@ -52,11 +52,11 @@ class ParamBindingTest(unittest.TestCase):
def test_list_collection(self): def test_list_collection(self):
result = bind_params("%s", (['a', 'b', 'c'],), Encoder()) result = bind_params("%s", (['a', 'b', 'c'],), Encoder())
self.assertEqual(result, "[ 'a' , 'b' , 'c' ]") self.assertEqual(result, "['a', 'b', 'c']")
def test_set_collection(self): def test_set_collection(self):
result = bind_params("%s", (set(['a', 'b']),), Encoder()) result = bind_params("%s", (set(['a', 'b']),), Encoder())
self.assertIn(result, ("{ 'a' , 'b' }", "{ 'b' , 'a' }")) self.assertIn(result, ("{'a', 'b'}", "{'b', 'a'}"))
def test_map_collection(self): def test_map_collection(self):
vals = OrderedDict() vals = OrderedDict()
@@ -64,7 +64,7 @@ class ParamBindingTest(unittest.TestCase):
vals['b'] = 'b' vals['b'] = 'b'
vals['c'] = 'c' vals['c'] = 'c'
result = bind_params("%s", (vals,), Encoder()) result = bind_params("%s", (vals,), Encoder())
self.assertEqual(result, "{ 'a' : 'a' , 'b' : 'b' , 'c' : 'c' }") self.assertEqual(result, "{'a': 'a', 'b': 'b', 'c': 'c'}")
def test_quote_escaping(self): def test_quote_escaping(self):
result = bind_params("%s", ("""'ef''ef"ef""ef'""",), Encoder()) result = bind_params("%s", ("""'ef''ef"ef""ef'""",), Encoder())