Accesibility fixes from the report.

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

diff --git a/src/catalogue/test_utils.py b/src/catalogue/test_utils.py
index 8c76b89..6bc5569 100644 (file)
--- a/src/catalogue/test_utils.py
+++ b/src/catalogue/test_utils.py
@@ -1,27 +1,25 @@
-# -*- 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.
 #
 from os.path import abspath, dirname, join
 import tempfile
 from traceback import extract_stack
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from os.path import abspath, dirname, join
 import tempfile
 from traceback import extract_stack

+from django.conf import settings

 from django.test import TestCase
 from django.test.utils import override_settings
 from slugify import slugify
 from librarian import WLURI
 from django.test import TestCase
 from django.test.utils import override_settings
 from slugify import slugify
 from librarian import WLURI

-from django.conf import settings

 
 
 @override_settings(
     MEDIA_ROOT=tempfile.mkdtemp(prefix='djangotest_'),
     CATALOGUE_DONT_BUILD={'pdf', 'mobi', 'epub', 'txt', 'fb2', 'cover'},
     NO_SEARCH_INDEX=True,
 
 
 @override_settings(
     MEDIA_ROOT=tempfile.mkdtemp(prefix='djangotest_'),
     CATALOGUE_DONT_BUILD={'pdf', 'mobi', 'epub', 'txt', 'fb2', 'cover'},
     NO_SEARCH_INDEX=True,

-    CELERY_ALWAYS_EAGER=True,
+    CELERY_TASK_ALWAYS_EAGER=True,

     CACHES={
     CACHES={

-            'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
-        },
+        'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
+    },

     SOLR=settings.SOLR_TEST,
     SOLR=settings.SOLR_TEST,

-    SSIFY_RENDER=False,

 )
 class WLTestCase(TestCase):
     """
 )
 class WLTestCase(TestCase):
     """


@@ -30,7 +28,7 @@ class WLTestCase(TestCase):
     longMessage = True
 
 
     longMessage = True
 
 

-class PersonStub(object):
+class PersonStub:

 
     def __init__(self, first_names, last_name):
         self.first_names = first_names
 
     def __init__(self, first_names, last_name):
         self.first_names = first_names


@@ -40,7 +38,7 @@ class PersonStub(object):
         return " ".join(self.first_names + (self.last_name,))
 
 
         return " ".join(self.first_names + (self.last_name,))
 
 

-class BookInfoStub(object):
+class BookInfoStub:

     _empty_fields = ['cover_url', 'variant_of']
     # allow single definition for multiple-value fields
     _salias = {
     _empty_fields = ['cover_url', 'variant_of']
     # allow single definition for multiple-value fields
     _salias = {


@@ -58,27 +56,26 @@ class BookInfoStub(object):
     def __getattr__(self, key):
         try:
             return self.__dict[key]
     def __getattr__(self, key):
         try:
             return self.__dict[key]

-        except KeyError:
+        except KeyError as e:

             if key in self._empty_fields:
                 return None
             if key in self._empty_fields:
                 return None

-            elif key in self._salias:
+            if key in self._salias:

                 return [getattr(self, self._salias[key])]
                 return [getattr(self, self._salias[key])]

-            else:
-                raise
+            raise AttributeError(e)

 
     def to_dict(self):
 
     def to_dict(self):

-        return dict((key, unicode(value)) for key, value in self.__dict.items())
+        return dict((key, str(value)) for key, value in self.__dict.items())

 
 
 def info_args(title, language=None):
     """ generate some keywords for comfortable BookInfoCreation  """
 
 
 def info_args(title, language=None):
     """ generate some keywords for comfortable BookInfoCreation  """

-    slug = unicode(slugify(title))
+    slug = str(slugify(title))

     if language is None:
     if language is None:

-        language = u'pol'
+        language = 'pol'

     return {
     return {

-        'title': unicode(title),
+        'title': str(title),

         'url': WLURI.from_slug(slug),
         'url': WLURI.from_slug(slug),

-        'about': u"http://wolnelektury.pl/example/URI/%s" % slug,
+        'about': "http://wolnelektury.pl/example/URI/%s" % slug,

         'language': language,
     }
 
         'language': language,
     }