From d24677992eae50000fb18cc5a64b4ec5431583c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 2 Nov 2016 10:52:44 +0100 Subject: [PATCH] Datetimes in dynamic properties are now timezone-aware (but hardcoded). --- pillar/api/custom_field_validation.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pillar/api/custom_field_validation.py b/pillar/api/custom_field_validation.py index 2328ead2..98929159 100644 --- a/pillar/api/custom_field_validation.py +++ b/pillar/api/custom_field_validation.py @@ -1,7 +1,7 @@ import logging -from bson import ObjectId -from datetime import datetime +from bson import ObjectId, tz_util +from datetime import datetime, tzinfo from eve.io.mongo import Validator from flask import current_app @@ -42,7 +42,9 @@ class ValidateCustomFields(Validator): # Convert datetime string to RFC1123 datetime elif prop_type == 'datetime': prop_val = properties[prop] - properties[prop] = datetime.strptime(prop_val, date_format) + prop_naieve = datetime.strptime(prop_val, date_format) + prop_aware = prop_naieve.replace(tzinfo=tz_util.utc) + properties[prop] = prop_aware elif prop_type == 'objectid': prop_val = properties[prop]