Minor fixes.

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

diff --git a/src/picture/tasks.py b/src/picture/tasks.py
index cae7db7..e815f19 100644 (file)
--- 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.
 #
 # 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
 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)
 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))
 
 
     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)
     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
         print_exc()
         raise e