Make c.util.Time comparable to integer types.

aholmberg · aholmberg · commit 91e5afbe72e6 · 2015-02-02T15:40:11.000-06:00
diff --git a/cassandra/util.py b/cassandra/util.py
@@ -740,6 +740,9 @@ def __eq__(self, other):
         if isinstance(other, Time):
             return self.nanosecond_time == other.nanosecond_time
 
+        if isinstance(other, six.integer_types):
+            return self.nanosecond_time == other
+
         return self.nanosecond_time % Time.MICRO == 0 and \
             datetime.time(hour=self.hour, minute=self.minute, second=self.second,
                           microsecond=self.nanosecond // Time.MICRO) == other
diff --git a/tests/unit/test_marshalling.py b/tests/unit/test_marshalling.py
@@ -24,7 +24,7 @@
 from uuid import UUID
 
 from cassandra.cqltypes import lookup_casstype
-from cassandra.util import OrderedMap, sortedset
+from cassandra.util import OrderedMap, sortedset, Time
 
 marshalled_value_pairs = (
     # binary form, type, python native type
@@ -81,7 +81,7 @@
     (b'\x00\x01\x00\x10\xafYC\xa3\xea<\x11\xe1\xabc\xc4,\x03"y\xf0', 'ListType(TimeUUIDType)', [UUID(bytes=b'\xafYC\xa3\xea<\x11\xe1\xabc\xc4,\x03"y\xf0')]),
     (b'\x80\x00\x00\x01', 'SimpleDateType', date(1970,1,2)),
     (b'\x7f\xff\xff\xff', 'SimpleDateType', date(1969,12,31)),
-    (b'\x00\x00\x00\x00\x00\x00\x00\x01', 'TimeType', 1)
+    (b'\x00\x00\x00\x00\x00\x00\x00\x01', 'TimeType', Time(1))
 )
 
 ordered_map_value = OrderedMap([(u'\u307fbob', 199),
diff --git a/tests/unit/test_types.py b/tests/unit/test_types.py
@@ -11,8 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import tempfile
-
 try:
     import unittest2 as unittest
 except ImportError:
@@ -21,18 +19,20 @@
 from binascii import unhexlify
 import calendar
 import datetime
+import tempfile
 import time
+
 import cassandra
 from cassandra.cqltypes import (BooleanType, lookup_casstype_simple, lookup_casstype,
                                 LongType, DecimalType, SetType, cql_typename,
                                 CassandraType, UTF8Type, parse_casstype_args,
                                 SimpleDateType, TimeType,
                                 EmptyValue, _CassandraType, DateType, int64_pack)
-from cassandra.query import named_tuple_factory
+from cassandra.encoder import cql_quote
 from cassandra.protocol import (write_string, read_longstring, write_stringmap,
                                 read_stringmap, read_inet, write_inet,
                                 read_string, write_longstring)
-from cassandra.encoder import cql_quote
+from cassandra.query import named_tuple_factory
 
 
 class TypeTests(unittest.TestCase):
