From aa126d79c71639bd5bdc57fe61bf2cc121a5beb5 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 16 Jul 2013 11:49:39 +0200 Subject: [PATCH 1/1] Move to Pillow-compatible imports. --- .gitmodules | 2 +- apps/cover/tests.py | 2 +- apps/cover/views.py | 4 ++-- lib/librarian | 2 +- requirements.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 56b9c425..004f6f37 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "lib/librarian"] path = lib/librarian - url = git://github.com/fnp/librarian.git + url = git://git.nowoczesnapolska.org.pl/librarian.git diff --git a/apps/cover/tests.py b/apps/cover/tests.py index d3bade2b..2f5b304e 100644 --- a/apps/cover/tests.py +++ b/apps/cover/tests.py @@ -17,4 +17,4 @@ class FlickrTests(TestCase): self.assertEqual(form.cleaned_data['title'], u"Pirate Stańczyk") self.assertEqual(form.cleaned_data['license_name'], "CC BY 2.0") self.assertEqual(form.cleaned_data['license_url'], "http://creativecommons.org/licenses/by/2.0/deed.en") - self.assertEqual(form.cleaned_data['download_url'], "https://farm8.staticflickr.com/7069/6941928577_2a0306f6a6_b.jpg") + self.assertEqual(form.cleaned_data['download_url'], "https://farm8.staticflickr.com/7069/6941928577_415844c58e_o.jpg") diff --git a/apps/cover/views.py b/apps/cover/views.py index 0c29209c..2a21b5c5 100644 --- a/apps/cover/views.py +++ b/apps/cover/views.py @@ -25,7 +25,7 @@ def preview(request, book, chunk=None, rev=None): If chunk and rev number are given, use version from given revision. If rev is not given, use publishable version. """ - import Image + from PIL import Image from librarian.cover import WLCover from librarian.dcparser import BookInfo @@ -56,7 +56,7 @@ def preview(request, book, chunk=None, rev=None): @require_POST def preview_from_xml(request): from hashlib import sha1 - import Image + from PIL import Image from os import makedirs from lxml import etree from librarian.cover import WLCover diff --git a/lib/librarian b/lib/librarian index 1ffcf32a..85ab1e2d 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit 1ffcf32a8d795681f54bd125ca45e908da5ed3fb +Subproject commit 85ab1e2d4b363dc747eacda08fa254586905cf25 diff --git a/requirements.txt b/requirements.txt index 997336b4..9eb392b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ lxml>=2.2.2 mercurial>=1.6,<1.7 PyYAML>=3.0 -PIL>=1.1 +Pillow oauth2 httplib2 # oauth2 dependency -- 2.20.1