Merge remote-tracking branch 'remotes/origin/patch-1'

hppj · Mar 7, 2012 · d813423 · d813423
2 parents bb29fe6 + 0e76966
commit d813423
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pycassa/types.py b/pycassa/types.py
@@ -117,8 +117,13 @@ class DateType(CassandraType):
 
 def _to_timestamp(v, use_micros=False):
     # Expects Value to be either date or datetime
-    scale = 1e6 if use_micros else 1e3
-    micro_scale = 1.0 if use_micros else 1e3
+    if use_micros:
+        scale = 1e6
+        micro_scale = 1.0
+    else:
+        scale = 1e3
+        micro_scale = 1e3
+
     try:
         converted = time.mktime(v.timetuple())
         converted = (converted * scale) + \