Upgrade pillow to 5.2.0

.travis.yml

@@ -13,7 +13,7 @@ before_install:
   - sudo apt-get install libwebp-dev liblcms2-dev
   - sudo apt-get install python-numpy python-opencv python-pycurl
 install:
-  - pip install tornado==5.1.0 Pillow==2.9.0 coveralls
+  - pip install tornado==5.1.0 Pillow==5.2.0 coveralls
   - pip install pep8==1.6.2 pyflakes==0.8.1
 before_script:
   - pep8 --exclude=test pilbox

pilbox/image.py

@@ -268,21 +268,27 @@ def save(self, **kwargs):
             save_kwargs["exif"] = self._exif
 
         color = color_hex_to_dec_tuple(opts["background"])
+
         if self.img.mode == "RGBA":
             self._background(fmt, color)
 
+        if fmt == "JPEG":
+            if self.img.mode == "P":
+                # Converting old GIF and PNG files to JPEG can raise
+                # IOError: cannot write mode P as JPEG
+                # https://mail.python.org/pipermail/python-list/2000-May/036017.html
+                self.img = self.img.convert("RGB")
+            elif self.img.mode == "RGBA":
+                # JPEG does not have an alpha channel so cannot be
+                # saved as RGBA. It must be converted to RGB.
+                self.img = self.img.convert("RGB")
+
         if self._orig_format == "JPEG":
             self.img.format = self._orig_format
             save_kwargs["subsampling"] = "keep"
             if opts["quality"] == "keep":
                 save_kwargs["quality"] = "keep"
 
-        if fmt == "JPEG" and self.img.mode == 'P':
-            # Converting old GIF and PNG files to JPEG can raise
-            # IOError: cannot write mode P as JPEG
-            # https://mail.python.org/pipermail/python-list/2000-May/036017.html
-            self.img = self.img.convert("RGB")
-
         try:
             self.img.save(outfile, fmt, **save_kwargs)
         except IOError as e:

pilbox/test/image_test.py

@@ -11,6 +11,7 @@
 from pilbox import errors
 from pilbox.image import color_hex_to_dec_tuple, Image
 
+
 try:
     import cv
 except ImportError:
@@ -321,6 +322,9 @@ def test_invalid_color_hex_to_dec_tuple(self):
 
     def test_save_failure(self):
         img = Image(os.path.join(DATADIR, 'test5.gif'))
+        def _mock_save(*args, **kwargs):
+            raise IOError('foo')
+        img.img.save = _mock_save
         self.assertRaises(errors.ImageSaveError,
                           lambda: img.save(format="webp"))
 

provisioning/playbook.yml

@@ -52,7 +52,7 @@
         version={{ item.version }}
         use_mirrors=yes
       with_items:
-        - { name: 'Pillow', version: '2.9.0' }
+        - { name: 'Pillow', version: '5.2.0' }
         - { name: 'tornado', version: '5.1.0' }
         - { name: 'coverage', version: '3.6' }
         - { name: 'pep8', version: '1.6.2' }

setup.py

@@ -43,8 +43,8 @@ def run(self):
         'pilbox': ['frontalface.xml'],
         },
       install_requires=[
-        'Pillow==2.9.0',
         'tornado==5.1.0',
+        'Pillow==5.2.0',
         'sphinx-me==0.2.1',
         ],
       extras_require = {