Merge pull request #125 from kunteng/master

Fix datetime timestamp conversion when datetime is not in local time

Author: LeoErcolanelli

algoliasearch/helpers.py

@@ -22,12 +22,12 @@
 THE SOFTWARE.
 """
 
+import calendar
+import datetime
+import decimal
+import json
 import sys
 import warnings
-import json
-import decimal
-import time
-import datetime
 
 try:
     from urllib import quote
@@ -102,7 +102,7 @@ def default(self, obj):
             return float(obj)
         elif isinstance(obj, datetime.datetime):
             try:
-                return int(time.mktime(obj.timetuple()))
+                return int(calendar.timegm(obj.utctimetuple()))
             except:
                 return 0
 

tests/test_index.py

@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 import os
-import time
+import calendar
 from random import randint
 from decimal import Decimal
 from datetime import datetime
@@ -111,7 +111,7 @@ def test_encode_datetime(self):
         self.index.wait_task(task['taskID'])
 
         res = self.index.get_object(task['objectID'])
-        self.assertEqual(res['now'], time.mktime(value.timetuple()))
+        self.assertEqual(res['now'], calendar.timegm(value.utctimetuple()))
 
     def test_synonyms(self):
         task = self.index.add_object({'name': '589 Howard St., San Francisco'})