commit 2a7f4f6496df2374345c32ae9011b4424cb25b9c
author Matteo Scandolo <teo@opennetworking.org> Wed Jan 24 13:18:40 2018 -0800
committer Matteo Scandolo <teo@opennetworking.org> Fri Jan 26 18:39:01 2018 +0000
tree e2f53e1bdcce639dbe4a5c6793a68f630ba25d0e
parent d0693cc3fe374b637156aa555bcf36243010fc46

[CORD-2576] Not converting to timezones when parsing for redis

Change-Id: I5470b6c8b9816b12219cdb97be4aeb2cffafe884
(cherry picked from commit a02c6996d73900feeba2869fe104f0c3b25c3b88)

xos/core/models/attic/xosbase_header.py

diff --git a/xos/core/models/attic/xosbase_header.py b/xos/core/models/attic/xosbase_header.py
index 13e628a..0923c04 100644
--- a/xos/core/models/attic/xosbase_header.py
+++ b/xos/core/models/attic/xosbase_header.py
@@ -16,6 +16,7 @@
 
 import datetime
 import time
+import calendar
 import json
 import pytz
 import inspect
@@ -48,7 +49,7 @@
         # json can't serialize DstTzInfo
         return str(obj)
     elif hasattr(obj, 'timetuple'):
-        return time.mktime(obj.timetuple())
+        return calendar.timegm(obj.timetuple())
     else:
         return obj
 

xos/core/models/user.py

diff --git a/xos/core/models/user.py b/xos/core/models/user.py
index 1304e1d..359715a 100644
--- a/xos/core/models/user.py
+++ b/xos/core/models/user.py
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-import datetime
 import hashlib
 import os
 import sys