X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/cad95a5f21346628d1dffa3b50ffa8f38baa5972..e7451b87d12c06755d6dc278e72b6650f8de8b4a:/src/picture/tasks.py?ds=sidebyside diff --git a/src/picture/tasks.py b/src/picture/tasks.py index cae7db7a6..e815f190c 100644 --- a/src/picture/tasks.py +++ b/src/picture/tasks.py @@ -1,7 +1,7 @@ -# -*- 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. # +import json from traceback import print_exc from celery.task import task @@ -13,11 +13,12 @@ from django.template.loader import render_to_string def generate_picture_html(picture_id): import picture.models pic = picture.models.Picture.objects.get(pk=picture_id) + areas_json = json.loads(pic.areas_json) - html_text = unicode(render_to_string('picture/picture_info.html', { - 'things': pic.areas_json['things'], - 'themes': pic.areas_json['themes'], - })) + html_text = render_to_string('picture/picture_info.html', { + 'things': areas_json['things'], + 'themes': areas_json['themes'], + }) pic.html_file.save("%s.html" % pic.slug, ContentFile(html_text)) @@ -26,7 +27,7 @@ def index_picture(picture_id, picture_info=None, **kwargs): from picture.models import Picture try: return Picture.objects.get(id=picture_id).search_index(picture_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