More Py3 compatibility fixes.

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

diff --git a/src/catalogue/test_utils.py b/src/catalogue/test_utils.py
index 9d87311..7ed3536 100644 (file)
--- a/src/catalogue/test_utils.py
+++ b/src/catalogue/test_utils.py
@@ -7,14 +7,14 @@ import tempfile
 from traceback import extract_stack
 from django.test import TestCase
 from django.test.utils import override_settings
 from traceback import extract_stack
 from django.test import TestCase
 from django.test.utils import override_settings

-from fnpdjango.utils.text.slughifi import slughifi
+from slugify import slugify

 from librarian import WLURI
 from django.conf import settings
 
 
 @override_settings(
     MEDIA_ROOT=tempfile.mkdtemp(prefix='djangotest_'),
 from librarian import WLURI
 from django.conf import settings
 
 
 @override_settings(
     MEDIA_ROOT=tempfile.mkdtemp(prefix='djangotest_'),

-    CATALOGUE_DONT_BUILD=set(['pdf', 'mobi', 'epub', 'txt', 'fb2', 'cover']),
+    CATALOGUE_DONT_BUILD={'pdf', 'mobi', 'epub', 'txt', 'fb2', 'cover'},

     NO_SEARCH_INDEX=True,
     CELERY_ALWAYS_EAGER=True,
     CACHES={
     NO_SEARCH_INDEX=True,
     CELERY_ALWAYS_EAGER=True,
     CACHES={


@@ -58,25 +58,25 @@ 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
             elif key in self._salias:
                 return [getattr(self, self._salias[key])]
             else:
             if key in self._empty_fields:
                 return None
             elif key in self._salias:
                 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(slughifi(title))
+    slug = str(slugify(title))

     if language is None:
         language = u'pol'
     return {
     if language is None:
         language = u'pol'
     return {

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

         'url': WLURI.from_slug(slug),
         'about': u"http://wolnelektury.pl/example/URI/%s" % slug,
         'language': language,
         'url': WLURI.from_slug(slug),
         'about': u"http://wolnelektury.pl/example/URI/%s" % slug,
         'language': language,


@@ -91,3 +91,7 @@ def get_fixture(path, app=None):
         mod_path = extract_stack(limit=2)[0][0]
         f_path = join(dirname(abspath(mod_path)), 'files', path)
     return f_path
         mod_path = extract_stack(limit=2)[0][0]
         f_path = join(dirname(abspath(mod_path)), 'files', path)
     return f_path

+
+
+def get_mp3_length(path):
+    return 60