Cutting stuff out.

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

diff --git a/src/catalogue/test_utils.py b/src/catalogue/test_utils.py
index ad3e491..c15cba7 100644 (file)
--- a/src/catalogue/test_utils.py
+++ b/src/catalogue/test_utils.py
@@ -1,15 +1,14 @@
-# -*- 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
+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.conf import settings
 
 
 @override_settings(
@@ -18,9 +17,8 @@ from django.conf import settings
     NO_SEARCH_INDEX=True,
     CELERY_TASK_ALWAYS_EAGER=True,
     CACHES={
-            'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
-        },
-    SOLR=settings.SOLR_TEST,
+        'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
+    },
 )
 class WLTestCase(TestCase):
     """
@@ -29,7 +27,7 @@ class WLTestCase(TestCase):
     longMessage = True
 
 
-class PersonStub(object):
+class PersonStub:
 
     def __init__(self, first_names, last_name):
         self.first_names = first_names
@@ -39,7 +37,7 @@ class PersonStub(object):
         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 = {
@@ -60,10 +58,9 @@ class BookInfoStub(object):
         except KeyError as e:
             if key in self._empty_fields:
                 return None
-            elif key in self._salias:
+            if key in self._salias:
                 return [getattr(self, self._salias[key])]
-            else:
-                raise AttributeError(e)
+            raise AttributeError(e)
 
     def to_dict(self):
         return dict((key, str(value)) for key, value in self.__dict.items())
@@ -73,11 +70,11 @@ def info_args(title, language=None):
     """ generate some keywords for comfortable BookInfoCreation  """
     slug = str(slugify(title))
     if language is None:
-        language = u'pol'
+        language = 'pol'
     return {
         'title': str(title),
-        'url': WLURI.from_slug(slug),
-        'about': u"http://wolnelektury.pl/example/URI/%s" % slug,
+        'url': WLURI(slug),
+        'about': "http://wolnelektury.pl/example/URI/%s" % slug,
         'language': language,
     }