Merge 58d0d34 into 5b39bd4

.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==4.5.1 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

CHANGES.txt

@@ -57,3 +57,4 @@
   * 1.3.0: Increased Pillow to 4.1.0 and Tornado to 4.5.1
   * 1.3.1: Fix pilbox.image CLI for python 3.0
   * 1.3.2: Fix GIF P-mode to JPEG conversion
+  * 1.3.3: Increase Pillow version to 5.2.0 and Tornado version to 5.1.0

README.rst

@@ -654,3 +654,4 @@ Changelog
 -  1.3.0: Increased Pillow to 2.9.0 and Tornado to 4.5.1
 -  1.3.1: Fix pilbox.image CLI for python 3.0
 -  1.3.2: Fix GIF P-mode to JPEG conversion
+-  1.3.3: Increase Pillow version to 5.2.0 and Tornado version to 5.1.0

pilbox/__init__.py

@@ -80,13 +80,14 @@
   * 1.3.0: Increased Pillow to 2.9.0 and Tornado to 4.5.1
   * 1.3.1: Fix pilbox.image CLI for python 3.0
   * 1.3.2: Fix GIF P-mode to JPEG conversion
+  * 1.3.3: Increase Pillow version to 5.2.0 and Tornado version to 5.1.0
 """
 
 # human-readable version number
-version = "1.3.2"
+version = "1.3.3"
 
 # The first three numbers are the components of the version number.
 # The fourth is zero for an official release, positive for a development
 # branch, or negative for a release candidate or beta (after the base version
 # number has been incremented)
-version_info = (1, 3, 2, 0)
+version_info = (1, 3, 3, 0)

pilbox/image.py

@@ -271,17 +271,21 @@ def save(self, **kwargs):
         if self.img.mode == "RGBA":
             self._background(fmt, color)
 
-        if self._orig_format == "JPEG":
-            self.img.format = self._orig_format
+        if self.img.format == "JPEG":
             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")
+        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")
 
         try:
             self.img.save(outfile, fmt, **save_kwargs)

pilbox/test/app_test.py

@@ -168,17 +168,14 @@ def get_handlers(self):
 
 class _DelayedHandler(tornado.web.RequestHandler):
 
-    @tornado.web.asynchronous
+    @tornado.gen.coroutine
     def get(self):
-        delay = time.time() + float(self.get_argument("delay", 0.0))
-        yield tornado.gen.Task(
-            tornado.ioloop.IOLoop.instance().add_timeout, delay)
+        yield tornado.gen.sleep(float(self.get_argument("delay", 0.0)))
         self.finish()
 
 
 class _UserAgentHandler(tornado.web.RequestHandler):
 
-    @tornado.web.asynchronous
     def get(self):
         ua = self.request.headers.get("User-Agent", "")
         expected_ua = self.get_argument("ua", "")
@@ -189,7 +186,7 @@ def get(self):
 
         self.set_status(200)
         self.set_header("Content-Type", "image/jpeg")
-        img = PIL.Image.new('RGBA', (1, 1))
+        img = PIL.Image.new('RGB', (1, 1))
         outfile = BytesIO()
         img.save(outfile, "JPEG")
         outfile.seek(0)
@@ -528,7 +525,7 @@ def get_app(self):
         return _PilboxTestApplication(
             client_name=self.NAME,
             client_key=self.KEY,
-            allowed_hosts=["foo.co", "bar.io", "localhost"],
+            allowed_hosts=["foo.co", "bar.io", "localhost", "127.0.0.1"],
             timeout=10.0)
 
     def test_missing_client_name(self):

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,8 +52,8 @@
         version={{ item.version }}
         use_mirrors=yes
       with_items:
-        - { name: 'Pillow', version: '2.9.0' }
-        - { name: 'tornado', version: '4.5.1' }
+        - { name: 'Pillow', version: '5.2.0' }
+        - { name: 'tornado', version: '5.1.0' }
         - { name: 'coverage', version: '3.6' }
         - { name: 'pep8', version: '1.6.2' }
         - { name: 'pyflakes', version: '0.8.1' }

setup.py

@@ -21,7 +21,7 @@ def run(self):
 
 
 setup(name='pilbox',
-      version='1.3.2',
+      version='1.3.3',
       description='Pilbox is an image processing application server built on the Tornado web framework using the Pillow Imaging Library',
       long_description=readme,
       classifiers=[
@@ -43,8 +43,8 @@ def run(self):
         'pilbox': ['frontalface.xml'],
         },
       install_requires=[
-        'tornado==4.5.1',
-        'Pillow==2.9.0',
+        'tornado==5.1.0',
+        'Pillow==5.2.0',
         'sphinx-me==0.2.1',
         ],
       extras_require = {