use Pillow instead of PIL; Fix Image import

This commit is contained in:
hplattner 2016-03-01 15:00:45 +01:00
parent 861f340b81
commit 66526863ca
2 changed files with 7 additions and 3 deletions

View file

@ -27,8 +27,12 @@ $Id$
from logging import getLogger
try:
import Image
except ImportError:
getLogger('Asset Manager').warn('Python Imaging Library could not be found.')
except:
try:
from PIL import Image
except:
getLogger('Asset Manager').warn('Python Imaging Library '
'could not be found.')
from zope.interface import implements

View file

@ -20,7 +20,7 @@ setup(name='cybertools',
install_requires=[
# -*- Extra requirements: -*-
'lxml',
'PIL',
'Pillow',
'zope.app.catalog',
'zope.app.file',
'zope.app.intid',