Projet

Général

Profil

0002-family-always-localize-received-datetime-41327.patch

Benjamin Dauvergne, 04 avril 2020 12:02

Télécharger (1,19 ko)

Voir les différences:

Subject: [PATCH 2/2] family: always localize received datetime (#41327)

 passerelle/apps/family/models.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
passerelle/apps/family/models.py
21 21
import sys
22 22
import zipfile
23 23

  
24
import pytz
25

  
24 26
from collections import defaultdict
25 27

  
26 28
from django.core.exceptions import ValidationError
......
58 60
    if not isinstance(date, datetime):
59 61
        try:
60 62
            date = datetime.strptime(date, DATETIME_FORMAT)
63
            # full datetime are supposed in UTC timezone
64
            date = pytz.utc.localize(date)
61 65
        except ValueError:
62 66
            date = datetime.strptime(date, DATE_FORMAT)
63
    if is_naive(date):
64
        date = make_aware(date)
67
            # simple date are supposed in local timezone
68
            date = make_aware(date)
65 69
    return date
66 70

  
67 71

  
68
-