Fixes.

[wolnelektury.git] / src / opds / views.py

diff --git a/src/opds/views.py b/src/opds/views.py
index 004ee5b..c71822f 100644 (file)
--- a/src/opds/views.py
+++ b/src/opds/views.py
@@ -1,13 +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 functools import reduce

 import os.path
 import os.path

-from urlparse import urljoin
+from urllib.parse import urljoin

 
 from django.contrib.syndication.views import Feed
 
 from django.contrib.syndication.views import Feed

-from django.core.urlresolvers import reverse

 from django.shortcuts import get_object_or_404
 from django.shortcuts import get_object_or_404

+from django.urls import reverse

 from django.utils.feedgenerator import Atom1Feed
 from django.conf import settings
 from django.http import Http404
 from django.utils.feedgenerator import Atom1Feed
 from django.conf import settings
 from django.http import Http404


@@ -78,13 +78,13 @@ class OPDSFeed(Atom1Feed):
 
     _book_parent_img = lazy(lambda: full_url(os.path.join(settings.STATIC_URL, "img/book-parent.png")), str)()
     try:
 
     _book_parent_img = lazy(lambda: full_url(os.path.join(settings.STATIC_URL, "img/book-parent.png")), str)()
     try:

-        _book_parent_img_size = unicode(os.path.getsize(os.path.join(settings.STATIC_ROOT, "img/book-parent.png")))
+        _book_parent_img_size = str(os.path.getsize(os.path.join(settings.STATIC_ROOT, "img/book-parent.png")))

     except OSError:
         _book_parent_img_size = ''
 
     _book_img = lazy(lambda: full_url(os.path.join(settings.STATIC_URL, "img/book.png")), str)()
     try:
     except OSError:
         _book_parent_img_size = ''
 
     _book_img = lazy(lambda: full_url(os.path.join(settings.STATIC_URL, "img/book.png")), str)()
     try:

-        _book_img_size = unicode(os.path.getsize(os.path.join(settings.STATIC_ROOT, "img/book.png")))
+        _book_img_size = str(os.path.getsize(os.path.join(settings.STATIC_ROOT, "img/book.png")))

     except OSError:
         _book_img_size = ''
 
     except OSError:
         _book_img_size = ''