Use Pillow-compatible imports.

diff --git a/librarian/cover.py b/librarian/cover.py
index a37b911..8b770ca 100644 (file)
--- a/librarian/cover.py
+++ b/librarian/cover.py
@@ -4,7 +4,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import re
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import re

-import Image, ImageFont, ImageDraw, ImageFilter, ImageEnhance
+from PIL import Image, ImageFont, ImageDraw, ImageFilter, ImageEnhance

 from StringIO import StringIO
 from librarian import get_resource, OutputFile, URLOpener
 
 from StringIO import StringIO
 from librarian import get_resource, OutputFile, URLOpener
 

diff --git a/setup.py b/setup.py
index 51003ef..b20040a 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,10 @@ setup(
     package_data={'librarian': ['xslt/*.xslt', 'epub/*', 'mobi/*', 'pdf/*', 'fb2/*', 'fonts/*', 'res/*'] +
                                 whole_tree(os.path.join(os.path.dirname(__file__), 'librarian'), 'font-optimizer')},
     include_package_data=True,
     package_data={'librarian': ['xslt/*.xslt', 'epub/*', 'mobi/*', 'pdf/*', 'fb2/*', 'fonts/*', 'res/*'] +
                                 whole_tree(os.path.join(os.path.dirname(__file__), 'librarian'), 'font-optimizer')},
     include_package_data=True,

-    install_requires=['lxml>=2.2'],
+    install_requires=[
+        'lxml>=2.2',
+        'Pillow',
+    ],

     scripts=['scripts/book2html',
              'scripts/book2txt',
              'scripts/book2epub',
     scripts=['scripts/book2html',
              'scripts/book2txt',
              'scripts/book2epub',