From 760cf2884080fd5b62f88968004a67a12946a257 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sat, 4 Apr 2020 11:59:36 +0200 Subject: [PATCH 2/2] family: always localize received datetime (#41327) --- passerelle/apps/family/models.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/passerelle/apps/family/models.py b/passerelle/apps/family/models.py index 974c8a19..c8813331 100644 --- a/passerelle/apps/family/models.py +++ b/passerelle/apps/family/models.py @@ -21,6 +21,8 @@ import os import sys import zipfile +import pytz + from collections import defaultdict from django.core.exceptions import ValidationError @@ -58,10 +60,12 @@ def get_datetime(date): if not isinstance(date, datetime): try: date = datetime.strptime(date, DATETIME_FORMAT) + # full datetime are supposed in UTC timezone + date = pytz.utc.localize(date) except ValueError: date = datetime.strptime(date, DATE_FORMAT) - if is_naive(date): - date = make_aware(date) + # simple date are supposed in local timezone + date = make_aware(date) return date -- 2.24.0