From 66526863cabae0c55c19dd28660cbc4dc963e7a1 Mon Sep 17 00:00:00 2001
From: hplattner <hannes@plattneronline.de>
Date: Tue, 1 Mar 2016 15:00:45 +0100
Subject: [PATCH] use Pillow instead of PIL; Fix Image import

---
 media/piltransform.py | 8 ++++++--
 setup.py              | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/media/piltransform.py b/media/piltransform.py
index a040103..ec17a3f 100644
--- a/media/piltransform.py
+++ b/media/piltransform.py
@@ -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
 
diff --git a/setup.py b/setup.py
index 5037004..410a643 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ setup(name='cybertools',
       install_requires=[
             # -*- Extra requirements: -*-
             'lxml',
-            'PIL',
+            'Pillow',
             'zope.app.catalog',
             'zope.app.file',
             'zope.app.intid',