From f5f3423e366c6ef239484a39d8b1d115623fabf0 Mon Sep 17 00:00:00 2001 From: Jeremy Zhang Date: Tue, 5 Sep 2017 07:29:36 +0000 Subject: [PATCH] Strip timezone information completely for comparing --- webapp/titanembeds/database/keyvalue_properties.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/titanembeds/database/keyvalue_properties.py b/webapp/titanembeds/database/keyvalue_properties.py index 89028af..cc2be9f 100644 --- a/webapp/titanembeds/database/keyvalue_properties.py +++ b/webapp/titanembeds/database/keyvalue_properties.py @@ -20,14 +20,14 @@ def set_keyvalproperty(key, value, expiration=None): def get_keyvalproperty(key): q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key) now = datetime.now() - if q.count() > 0 and (q.first().expiration is None or q.first().expiration.replace(tzinfo=None) > now): + if q.count() > 0 and (q.first().expiration.replace(tzinfo=None) is None or q.first().expiration.replace(tzinfo=None) > now.replace(tzinfo=None)): return q.first().value return None def getexpir_keyvalproperty(key): q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key) now = datetime.now() - if q.count() > 0 and (q.first().expiration is not None and q.first().expiration.replace(tzinfo=None) > now): + if q.count() > 0 and (q.first().expiration.replace(tzinfo=None) is not None and q.first().expiration.replace(tzinfo=None) > now.replace(tzinfo=None)): return int(q.first().expiration.strftime('%s')) return 0