[Pkg-mozext-commits] [adblock-plus] 02/24: Noissue - Fix PIL import

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 4ec9868aa96a32eeb58796d1c6e7cb9f0883c935
Author: Felix Dahlke <felix at adblockplus.org>
Date:   Fri Aug 8 16:53:45 2014 +0200

    Noissue - Fix PIL import
    
    Review: http://codereview.adblockplus.org/6214230382477312
---
 packagerChrome.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packagerChrome.py b/packagerChrome.py
index 8fd555e..30c3855 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -51,7 +51,10 @@ def processFile(path, data, params):
   return data
 
 def makeIcons(files, filenames):
-  from PIL import Image
+  try:
+    from PIL import Image
+  except ImportError:
+    import Image
   icons = {}
   for filename in filenames:
     width, height = Image.open(StringIO(files[filename])).size

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git