Fix utctimestamp conversion

paluh · Aug 25, 2013 · 9b9b7b9 · 9b9b7b9
1 parent c2aa727
commit 9b9b7b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cdef.py b/cdef.py
@@ -1,15 +1,19 @@
+import calendar
 import datetime
-import time
 
 
 def _coerce(v):
     return v if isinstance(v, Expression) else Expression(v)
 
+def utctimestamp(dt):
+    return int(calendar.timegm(dt.utctimetuple()))
+
+
 class Expression(object):
 
     def __init__(self, value):
         if isinstance(value, datetime.datetime):
-            self.value = int(time.mktime(value.timetuple()))
+            self.value = utctimestamp(value)
         else:
             self.value = value
 

diff --git a/tests.py b/tests.py
@@ -1,3 +1,4 @@
+import calendar
 import datetime
 from pytz import utc
 import unittest
@@ -28,7 +29,7 @@ def test_if_nested_statement(self):
                                  value,
                                  un2zero)
         self.assertEqual(unicode(alter_conditionally),
-                         u'TIME,1352895300,GT,value,value,UN,0,value,IF,IF')
+                         u'TIME,1352898900,GT,value,value,UN,0,value,IF,IF')
 
     def test_algebraic_expressions(self):
         expr = ((Expression(5) - Expression(2))/Expression(3) +