X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/652e2d66d7f88cc6b857edc4aaac7e14a654eb36..75957f735219259d3b4bc361f80ccd3d7b92a0e9:/src/catalogue/tasks.py?ds=sidebyside diff --git a/src/catalogue/tasks.py b/src/catalogue/tasks.py index 30bc55fe2..a7b67aec9 100644 --- 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. # -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 django.utils import timezone from catalogue.utils import gallery_path -from wolnelektury.utils import localtime_to_utc 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 = { - 'changed_at': localtime_to_utc(datetime.now()), + 'changed_at': timezone.now(), } type(tag).objects.filter(pk=tag.pk).update(**update_dict) @@ -29,8 +28,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) - except Exception, e: - print "Exception during index: %s" % e + except Exception as e: + print("Exception during index: %s" % e) print_exc() raise e @@ -57,7 +56,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) - 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()