From 26ffe9af977b5a97fe52d2bae15999dca0a15213 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 26 Feb 2016 13:26:17 +0100 Subject: [PATCH] utils: fix iso8601_to_datetime, make_naive amd make_aware need a timezone parameter --- mellon/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mellon/utils.py b/mellon/utils.py index edcba6f..b5f9956 100644 --- a/mellon/utils.py +++ b/mellon/utils.py @@ -9,7 +9,7 @@ import dateutil.parser from django.core.urlresolvers import reverse from django.template.loader import render_to_string -from django.utils.timezone import make_aware, now, make_naive, is_aware +from django.utils.timezone import make_aware, now, make_naive, is_aware, get_default_timezone from django.conf import settings import lasso @@ -142,10 +142,10 @@ def iso8601_to_datetime(date_string): dt = dateutil.parser.parse(date_string) if is_aware(dt): if not settings.USE_TZ: - dt = make_naive(dt) + dt = make_naive(dt, get_default_timezone()) else: if settings.USE_TZ: - dt = make_aware(dt) + dt = make_aware(dt, get_default_timezone()) return dt