Noissue - Fix PIL import

packagerChrome.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
 # Copyright (C) 2006-2014 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 33 matching lines @@
     if file.endswith('.js') or file.endswith('.html') or file.endswith('.xml'):
       result.add(file)
   return result
 
 def processFile(path, data, params):
   # We don't change anything yet, this function currently only exists here so
   # that it can be overridden if necessary.
   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
     if(width != height):
       print >>sys.stderr, 'Warning: %s size is %ix%i, icon should be square' % (filename, width, height)
     icons[width] = filename
   return icons
 
 def createManifest(params, files):
   template = getTemplate('manifest.json.tmpl')
@@ skipping 325 matching lines @@
   writePackage(outFile, pubkey, signature, zipdata)
 
 def createDevEnv(baseDir, type):
   fileBuffer = StringIO()
   createBuild(baseDir, type=type, outFile=fileBuffer, devenv=True, releaseBuild=True)
 
   from zipfile import ZipFile
   zip = ZipFile(StringIO(fileBuffer.getvalue()), 'r')
   zip.extractall(os.path.join(baseDir, 'devenv'))
   zip.close()