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

review fixes

Browse Source
This commit is contained in:
Alan Boudreault
2017-01-17 08:22:44 -05:00
parent 52120b83ef
commit c49421b077
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cassandra/encoder.py
View File

@@ -30,7 +30,7 @@ from uuid import UUID
import six import six
from cassandra.util import (OrderedDict, OrderedMap, OrderedMapSerializedKey, from cassandra.util import (OrderedDict, OrderedMap, OrderedMapSerializedKey,
sortedset, Time, Date, Duration) sortedset, Time, Date)
if six.PY3: if six.PY3:
long = int long = int
@@ -88,8 +88,7 @@ class Encoder(object):
sortedset: self.cql_encode_set_collection, sortedset: self.cql_encode_set_collection,
frozenset: self.cql_encode_set_collection, frozenset: self.cql_encode_set_collection,
types.GeneratorType: self.cql_encode_list_collection, types.GeneratorType: self.cql_encode_list_collection,
ValueSequence: self.cql_encode_sequence, ValueSequence: self.cql_encode_sequence
Duration: self.cql_encode_duration
} }
if six.PY2: if six.PY2:
@@ -226,9 +225,3 @@ class Encoder(object):
if :attr:`~Encoder.mapping` does not contain an entry for the type. if :attr:`~Encoder.mapping` does not contain an entry for the type.
""" """
return self.mapping.get(type(val), self.cql_encode_object)(val) return self.mapping.get(type(val), self.cql_encode_object)(val)
def cql_encode_duration(self, val):
"""
Encodes a :class:`cassandra.util.Duration` object as a string.
"""
return str(val)

2
cassandra/util.py
View File

@@ -1232,7 +1232,7 @@ class Duration(object):
return "Duration({0}, {1}, {2})".format(self.months, self.days, self.nanoseconds) return "Duration({0}, {1}, {2})".format(self.months, self.days, self.nanoseconds)
def __str__(self): def __str__(self):
return '{0}{1}mo{2}d{3}ns'.format( return '%s%dmo%dd%dns' % (
'-' if self._has_negative_values else '', '-' if self._has_negative_values else '',
abs(self.months), abs(self.months),
abs(self.days), abs(self.days),