Request validation fix.

[wolnelektury.git] / src / catalogue / tasks.py

diff --git a/src/catalogue/tasks.py b/src/catalogue/tasks.py
index 30bc55f..781dd6e 100644 (file)
--- a/src/catalogue/tasks.py
+++ b/src/catalogue/tasks.py
@@ -1,15 +1,13 @@
-# -*- coding: utf-8 -*-

 # 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 +16,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)


@@ -29,8 +27,8 @@ def index_book(book_id, book_info=None, **kwargs):
     from catalogue.models import Book
     try:
         return Book.objects.get(id=book_id).search_index(book_info, **kwargs)
     from catalogue.models import Book
     try:
         return Book.objects.get(id=book_id).search_index(book_info, **kwargs)

-    except Exception, e:
-        print "Exception during index: %s" % e
+    except Exception as e:
+        print("Exception during index: %s" % e)

         print_exc()
         raise e
 
         print_exc()
         raise e
 


@@ -57,7 +55,7 @@ def build_custom_pdf(book_id, customizations, file_name, waiter_id=None):
                 morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,
                 ilustr_path=gallery_path(wldoc.book_info.url.slug),
                 **kwargs)
                 morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,
                 ilustr_path=gallery_path(wldoc.book_info.url.slug),
                 **kwargs)

-            DefaultStorage().save(file_name, File(open(pdf.get_filename())))
+            DefaultStorage().save(file_name, File(open(pdf.get_filename(), 'rb')))

     finally:
         if waiter_id is not None:
             WaitedFile.objects.filter(pk=waiter_id).delete()
     finally:
         if waiter_id is not None:
             WaitedFile.objects.filter(pk=waiter_id).delete()