Permalink
Browse files

Merge pull request #10 from thmo/master

Support Pillow by using PIL in import statement
  • Loading branch information...
2 parents 4efbf11 + f6440b0 commit 00e223565e757dbc55ca3bf59545b0509e095a1d Sebastian committed Feb 6, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 textile/tests/__init__.py
  2. +2 −2 textile/tools/imagesize.py
@@ -426,7 +426,7 @@ def testSanitize(self):
def testImageSize(self):
try:
- import ImageFile
+ from PIL import ImageFile
except ImportError:
raise SkipTest()
@@ -14,7 +14,7 @@ def getimagesize(url):
"""
try:
- import ImageFile
+ from PIL import ImageFile
import urllib2
except ImportError:
return ''
@@ -36,6 +36,6 @@ def getimagesize(url):
def setup_module(module):
from nose.plugins.skip import SkipTest
try:
- import ImageFile
+ from PIL import ImageFile
except ImportError:
raise SkipTest()

0 comments on commit 00e2235

Please sign in to comment.