Minor fixes.

[wolnelektury.git] / src / catalogue / tests / test_bookmedia.py

diff --git a/src/catalogue/tests/test_bookmedia.py b/src/catalogue/tests/test_bookmedia.py
index 263e48d..6bc6aa3 100644 (file)
--- a/src/catalogue/tests/test_bookmedia.py
+++ b/src/catalogue/tests/test_bookmedia.py
@@ -1,4 +1,3 @@
-# -*- 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.
 #


@@ -15,8 +14,8 @@ class BookMediaTests(WLTestCase):
 
     def setUp(self):
         WLTestCase.setUp(self)
 
     def setUp(self):
         WLTestCase.setUp(self)

-        self.file = ContentFile('X')
-        self.file2 = ContentFile('Y')
+        self.file = ContentFile(b'X')
+        self.file2 = ContentFile(b'Y')

         self.book = models.Book.objects.create(slug='test-book', title='Test')
 
     def set_title(self, title):
         self.book = models.Book.objects.create(slug='test-book', title='Test')
 
     def set_title(self, title):


@@ -24,7 +23,7 @@ class BookMediaTests(WLTestCase):
         self.book.save()
 
     def test_diacritics(self):
         self.book.save()
 
     def test_diacritics(self):

-        bm = models.BookMedia(book=self.book, type="ogg", name=u"Zażółć gęślą jaźń")
+        bm = models.BookMedia(book=self.book, type="ogg", name="Zażółć gęślą jaźń")

         self.set_title(bm.name)
         bm.file.save(None, self.file)
         self.assertEqual(basename(bm.file.name), 'zazolc-gesla-jazn.ogg')
         self.set_title(bm.name)
         bm.file.save(None, self.file)
         self.assertEqual(basename(bm.file.name), 'zazolc-gesla-jazn.ogg')


@@ -50,7 +49,7 @@ class BookMediaTests(WLTestCase):
         bm.file.save(None, self.file)
         bm.file.save(None, self.file2)
 
         bm.file.save(None, self.file)
         bm.file.save(None, self.file2)
 

-        self.assertEqual(bm.file.read(), 'Y')
+        self.assertEqual(bm.file.read(), b'Y')

         self.assertEqual(basename(bm.file.name), 'some-media.ogg')
 
     @skip('broken, but is it needed?')
         self.assertEqual(basename(bm.file.name), 'some-media.ogg')
 
     @skip('broken, but is it needed?')


@@ -59,16 +58,16 @@ class BookMediaTests(WLTestCase):
             File save doesn't clobber some other media with similar name.
         """
 
             File save doesn't clobber some other media with similar name.
         """
 

-        bm = models.BookMedia(book=self.book, type='ogg', name=u"Tytul")
+        bm = models.BookMedia(book=self.book, type='ogg', name="Tytul")

         self.set_title(bm.name)
         bm.file.save(None, self.file)
         self.set_title(bm.name)
         bm.file.save(None, self.file)

-        bm2 = models.BookMedia(book=self.book, type='ogg', name=u"Tytuł")
+        bm2 = models.BookMedia(book=self.book, type='ogg', name="Tytuł")

         self.set_title(bm2.name)
         bm2.file.save(None, self.file2)
         self.assertEqual(basename(bm.file.name), 'tytul.ogg')
         self.assertNotEqual(basename(bm2.file.name), 'tytul.ogg')
         self.set_title(bm2.name)
         bm2.file.save(None, self.file2)
         self.assertEqual(basename(bm.file.name), 'tytul.ogg')
         self.assertNotEqual(basename(bm2.file.name), 'tytul.ogg')

-        self.assertEqual(bm.file.read(), 'X')
-        self.assertEqual(bm2.file.read(), 'Y')
+        self.assertEqual(bm.file.read(), b'X')
+        self.assertEqual(bm2.file.read(), b'Y')

 
     def test_change_name(self):
         """
 
     def test_change_name(self):
         """


@@ -81,7 +80,7 @@ class BookMediaTests(WLTestCase):
         self.set_title("Other Title")
         bm.save()
         self.assertEqual(basename(bm.file.name), 'other-title.ogg')
         self.set_title("Other Title")
         bm.save()
         self.assertEqual(basename(bm.file.name), 'other-title.ogg')

-        self.assertEqual(bm.file.read(), 'X')
+        self.assertEqual(bm.file.read(), b'X')

 
     @skip('broken, but is it needed?')
     def test_change_name_no_clobber(self):
 
     @skip('broken, but is it needed?')
     def test_change_name_no_clobber(self):


@@ -99,8 +98,8 @@ class BookMediaTests(WLTestCase):
         self.set_title("Title")
         bm2.save()
         self.assertNotEqual(basename(bm2.file.name), 'title.ogg')
         self.set_title("Title")
         bm2.save()
         self.assertNotEqual(basename(bm2.file.name), 'title.ogg')

-        self.assertEqual(bm.file.read(), 'X')
-        self.assertEqual(bm2.file.read(), 'Y')
+        self.assertEqual(bm.file.read(), b'X')
+        self.assertEqual(bm2.file.read(), b'Y')

 
     def test_zip_audiobooks(self):
         paths = [
 
     def test_zip_audiobooks(self):
         paths = [