timezone madness

diff --git a/src/catalogue/tasks.py b/src/catalogue/tasks.py
index 30bc55f..265897f 100644 (file)
--- a/src/catalogue/tasks.py
+++ b/src/catalogue/tasks.py
@@ -2,14 +2,13 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from datetime import datetime

 from traceback import print_exc
 from celery.task import task
 from celery.utils.log import get_task_logger
 from django.conf import settings
 from traceback import print_exc
 from celery.task import task
 from celery.utils.log import get_task_logger
 from django.conf import settings

+from django.utils import timezone

 
 from catalogue.utils import gallery_path
 
 from catalogue.utils import gallery_path

-from wolnelektury.utils import localtime_to_utc

 from waiter.models import WaitedFile
 
 task_logger = get_task_logger(__name__)
 from waiter.models import WaitedFile
 
 task_logger = get_task_logger(__name__)


@@ -18,7 +17,7 @@ task_logger = get_task_logger(__name__)
 # TODO: move to model?
 def touch_tag(tag):
     update_dict = {
 # TODO: move to model?
 def touch_tag(tag):
     update_dict = {

-        'changed_at': localtime_to_utc(datetime.now()),
+        'changed_at': timezone.now(),

     }
 
     type(tag).objects.filter(pk=tag.pk).update(**update_dict)
     }
 
     type(tag).objects.filter(pk=tag.pk).update(**update_dict)

diff --git a/src/contact/views.py b/src/contact/views.py
index 8bd8097..773f193 100644 (file)
--- a/src/contact/views.py
+++ b/src/contact/views.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 from urllib import unquote
 
 # -*- coding: utf-8 -*-
 from urllib import unquote
 

-import pytz
-from django.conf import settings
+from datetime import datetime

 from django.contrib.auth.decorators import permission_required
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.contrib.auth.decorators import permission_required
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render


@@ -11,11 +10,10 @@ from django.views.decorators.cache import never_cache
 from fnpdjango.utils.views import serve_file
 from honeypot.decorators import check_honeypot
 
 from fnpdjango.utils.views import serve_file
 from honeypot.decorators import check_honeypot
 

+from wolnelektury.utils import localtime_to_utc

 from .forms import contact_forms
 from .models import Attachment, Contact
 
 from .forms import contact_forms
 from .models import Attachment, Contact
 

-tz = pytz.timezone(settings.TIME_ZONE)
-

 
 @check_honeypot
 @never_cache
 
 @check_honeypot
 @never_cache


@@ -27,7 +25,7 @@ def form(request, form_tag, force_enabled=False):
     if not (force_enabled and request.user.is_superuser):
         disabled = getattr(form_class, 'disabled', False)
         end_tuple = getattr(form_class, 'ends_on')
     if not (force_enabled and request.user.is_superuser):
         disabled = getattr(form_class, 'disabled', False)
         end_tuple = getattr(form_class, 'ends_on')

-        end_time = timezone.datetime(*end_tuple, tzinfo=tz) if end_tuple else None
+        end_time = localtime_to_utc(datetime(*end_tuple)) if end_tuple else None

         expired = end_time and end_time < timezone.now()
         if disabled or expired:
             template = getattr(form_class, 'disabled_template', None)
         expired = end_time and end_time < timezone.now()
         if disabled or expired:
             template = getattr(form_class, 'disabled_template', None)