From 22a370afc219af47907b2fe69e791854dd2d9c79 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Sat, 10 May 2014 11:46:53 +0300
Subject: [PATCH 01/12] Fix 12-year-old FIXME

---
 PIL/Image.py | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/PIL/Image.py b/PIL/Image.py
index 333397701..7736a3718 100644
--- a/PIL/Image.py
+++ b/PIL/Image.py
@@ -101,7 +101,7 @@ import collections
 import numbers
 
 # works everywhere, win for pypy, not cpython
-USE_CFFI_ACCESS = hasattr(sys, 'pypy_version_info')  
+USE_CFFI_ACCESS = hasattr(sys, 'pypy_version_info')
 try:
     import cffi
     HAS_CFFI=True
@@ -233,7 +233,7 @@ _MODE_CONV = {
     "CMYK": ('|u1', 4),
     "YCbCr": ('|u1', 3),
     "LAB": ('|u1', 3), # UNDONE - unsigned |u1i1i1
-	# I;16 == I;16L, and I;32 == I;32L  
+	# I;16 == I;16L, and I;32 == I;32L
     "I;16": ('<u2', None),
     "I;16B": ('>u2', None),
     "I;16L": ('<u2', None),
@@ -502,7 +502,7 @@ class Image:
         return self
     def __exit__(self, *args):
         self.close()
-        
+
     def close(self):
         """
         Closes the file pointer, if possible.
@@ -524,7 +524,7 @@ class Image:
         # deferred error that will better explain that the core image
         # object is gone.
         self.im = deferred_error(ValueError("Operation on closed image"))
-        
+
 
     def _copy(self):
         self.load()
@@ -540,7 +540,7 @@ class Image:
         if not file:
             f, file = tempfile.mkstemp(suffix)
             os.close(f)
-            
+
         self.load()
         if not format or format == "PPM":
             self.im.save_ppm(file)
@@ -672,7 +672,7 @@ class Image:
         normal cases, you don't need to call this method, since the
         Image class automatically loads an opened image when it is
         accessed for the first time. This method will close the file
-        associated with the image. 
+        associated with the image.
 
         :returns: An image access object.
         """
@@ -777,7 +777,7 @@ class Image:
         if "transparency" in self.info and self.info['transparency'] is not None:
             if self.mode in ('L', 'RGB') and mode == 'RGBA':
                 # Use transparent conversion to promote from transparent
-                # color to an alpha channel.         
+                # color to an alpha channel.
                 return self._new(self.im.convert_transparent(
                                            mode, self.info['transparency']))
             elif self.mode in ('L', 'RGB', 'P') and mode in ('L', 'RGB', 'P'):
@@ -799,11 +799,11 @@ class Image:
                         trns_im = trns_im.convert(mode)
                     else:
                         # can't just retrieve the palette number, got to do it
-                        # after quantization. 
+                        # after quantization.
                         trns_im = trns_im.convert('RGB')
                     trns = trns_im.getpixel((0,0))
-                        
-                    
+
+
         if mode == "P" and palette == ADAPTIVE:
             im = self.im.quantize(colors)
             new = self._new(im)
@@ -811,7 +811,7 @@ class Image:
             new.palette = ImagePalette.raw("RGB", new.im.getpalette("RGB"))
             if delete_trns:
                 # This could possibly happen if we requantize to fewer colors.
-                # The transparency would be totally off in that case. 
+                # The transparency would be totally off in that case.
                 del(new.info['transparency'])
             if trns is not None:
                 try:
@@ -826,7 +826,7 @@ class Image:
         # colorspace conversion
         if dither is None:
             dither = FLOYDSTEINBERG
-                
+
         try:
             im = self.im.convert(mode, dither)
         except ValueError:
@@ -863,7 +863,7 @@ class Image:
         # quantizer interface in a later version of PIL.
 
         self.load()
-        
+
         if method is None:
             # defaults:
             method = 0
@@ -871,10 +871,10 @@ class Image:
                 method = 2
 
         if self.mode == 'RGBA' and method != 2:
-            # Caller specified an invalid mode. 
+            # Caller specified an invalid mode.
             raise ValueError('Fast Octree (method == 2) is the ' +
                              ' only valid method for quantizing RGBA images')
-        
+
         if palette:
             # use palette from reference image
             palette.load()
@@ -928,7 +928,7 @@ class Image:
     def draft(self, mode, size):
         """
         NYI
-        
+
         Configures the image file loader so it returns a version of the
         image that as closely as possible matches the given mode and
         size.  For example, you can use this method to convert a color
@@ -1277,7 +1277,7 @@ class Image:
             if self.mode in ("I", "I;16", "F"):
                 # check if the function can be used with point_transform
                 # UNDONE wiredfool -- I think this prevents us from ever doing
-                # a gamma function point transform on > 8bit images. 
+                # a gamma function point transform on > 8bit images.
                 scale, offset = _getscaleoffset(lut)
                 return self._new(self.im.point_transform(scale, offset))
             # for other modes, convert the function to a table
@@ -1420,8 +1420,8 @@ class Image:
             self._copy()
             self.pyaccess = None
             self.load()
-            
-        if self.pyaccess: 
+
+        if self.pyaccess:
             return self.pyaccess.putpixel(xy,value)
         return self.im.putpixel(xy, value)
 
@@ -1667,7 +1667,7 @@ class Image:
         """
         return 0
 
-    def thumbnail(self, size, resample=NEAREST):
+    def thumbnail(self, size, resample=ANTIALIAS):
         """
         Make this image into a thumbnail.  This method modifies the
         image to contain a thumbnail version of itself, no larger than
@@ -1690,14 +1690,10 @@ class Image:
            of :py:attr:`PIL.Image.NEAREST`, :py:attr:`PIL.Image.BILINEAR`,
            :py:attr:`PIL.Image.BICUBIC`, or :py:attr:`PIL.Image.ANTIALIAS`
            (best quality).  If omitted, it defaults to
-           :py:attr:`PIL.Image.NEAREST` (this will be changed to ANTIALIAS in a
-           future version).
+           :py:attr:`PIL.Image.ANTIALIAS`.
         :returns: None
         """
 
-        # FIXME: the default resampling filter will be changed
-        # to ANTIALIAS in future versions
-
         # preserve aspect ratio
         x, y = self.size
         if x > size[0]: y = int(max(y * size[0] / x, 1)); x = int(size[0])

From 74514fa1f54d82194d9cb2388f6383b6d8ca8df1 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Sat, 10 May 2014 12:34:36 +0300
Subject: [PATCH 02/12] Some pep8 and pyflakes cleanup

---
 PIL/Image.py | 152 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 94 insertions(+), 58 deletions(-)

diff --git a/PIL/Image.py b/PIL/Image.py
index 7736a3718..80b7258c6 100644
--- a/PIL/Image.py
+++ b/PIL/Image.py
@@ -30,6 +30,7 @@ from PIL import VERSION, PILLOW_VERSION, _plugins
 
 import warnings
 
+
 class _imaging_not_installed:
     # module placeholder
     def __getattr__(self, id):
@@ -52,7 +53,7 @@ try:
     # directly; import Image and use the Image.core variable instead.
     from PIL import _imaging as core
     if PILLOW_VERSION != getattr(core, 'PILLOW_VERSION', None):
-         raise ImportError("The _imaging extension was built for another "
+        raise ImportError("The _imaging extension was built for another "
                             " version of Pillow or PIL")
 
 except ImportError as v:
@@ -91,10 +92,13 @@ except ImportError:
     builtins = __builtin__
 
 from PIL import ImageMode
-from PIL._binary import i8, o8
-from PIL._util import isPath, isStringType, deferred_error
+from PIL._binary import i8
+from PIL._util import isPath
+from PIL._util import isStringType
+from PIL._util import deferred_error
 
-import os, sys
+import os
+import sys
 
 # type stuff
 import collections
@@ -104,9 +108,10 @@ import numbers
 USE_CFFI_ACCESS = hasattr(sys, 'pypy_version_info')
 try:
     import cffi
-    HAS_CFFI=True
+    HAS_CFFI = True
 except:
-    HAS_CFFI=False
+    HAS_CFFI = False
+
 
 def isImageType(t):
     """
@@ -148,16 +153,16 @@ MESH = 4
 # resampling filters
 NONE = 0
 NEAREST = 0
-ANTIALIAS = 1 # 3-lobed lanczos
+ANTIALIAS = 1  # 3-lobed lanczos
 LINEAR = BILINEAR = 2
 CUBIC = BICUBIC = 3
 
 # dithers
 NONE = 0
 NEAREST = 0
-ORDERED = 1 # Not yet implemented
-RASTERIZE = 2 # Not yet implemented
-FLOYDSTEINBERG = 3 # default
+ORDERED = 1  # Not yet implemented
+RASTERIZE = 2  # Not yet implemented
+FLOYDSTEINBERG = 3  # default
 
 # palettes/quantizers
 WEB = 0
@@ -222,7 +227,7 @@ else:
 
 _MODE_CONV = {
     # official modes
-    "1": ('|b1', None), # broken
+    "1": ('|b1', None),  # broken
     "L": ('|u1', None),
     "I": (_ENDIAN + 'i4', None),
     "F": (_ENDIAN + 'f4', None),
@@ -232,8 +237,8 @@ _MODE_CONV = {
     "RGBA": ('|u1', 4),
     "CMYK": ('|u1', 4),
     "YCbCr": ('|u1', 3),
-    "LAB": ('|u1', 3), # UNDONE - unsigned |u1i1i1
-	# I;16 == I;16L, and I;32 == I;32L
+    "LAB": ('|u1', 3),  # UNDONE - unsigned |u1i1i1
+    # I;16 == I;16L, and I;32 == I;32L
     "I;16": ('<u2', None),
     "I;16B": ('>u2', None),
     "I;16L": ('<u2', None),
@@ -248,6 +253,7 @@ _MODE_CONV = {
     "I;32LS": ('<i4', None),
 }
 
+
 def _conv_type_shape(im):
     shape = im.size[1], im.size[0]
     typ, extra = _MODE_CONV[im.mode]
@@ -368,8 +374,8 @@ def init():
     for plugin in _plugins:
         try:
             if DEBUG:
-                print ("Importing %s"%plugin)
-            __import__("PIL.%s"%plugin, globals(), locals(), [])
+                print ("Importing %s" % plugin)
+            __import__("PIL.%s" % plugin, globals(), locals(), [])
         except ImportError:
             if DEBUG:
                 print("Image: failed to import", end=' ')
@@ -379,6 +385,7 @@ def init():
         _initialized = 2
         return 1
 
+
 # --------------------------------------------------------------------
 # Codec factories (used by tobytes/frombytes and ImageFile.load)
 
@@ -398,6 +405,7 @@ def _getdecoder(mode, decoder_name, args, extra=()):
     except AttributeError:
         raise IOError("decoder %s not available" % decoder_name)
 
+
 def _getencoder(mode, encoder_name, args, extra=()):
 
     # tweak arguments
@@ -421,30 +429,36 @@ def _getencoder(mode, encoder_name, args, extra=()):
 def coerce_e(value):
     return value if isinstance(value, _E) else _E(value)
 
+
 class _E:
     def __init__(self, data):
         self.data = data
+
     def __add__(self, other):
         return _E((self.data, "__add__", coerce_e(other).data))
+
     def __mul__(self, other):
         return _E((self.data, "__mul__", coerce_e(other).data))
 
+
 def _getscaleoffset(expr):
     stub = ["stub"]
     data = expr(_E(stub)).data
     try:
-        (a, b, c) = data # simplified syntax
+        (a, b, c) = data  # simplified syntax
         if (a is stub and b == "__mul__" and isinstance(c, numbers.Number)):
             return c, 0.0
         if (a is stub and b == "__add__" and isinstance(c, numbers.Number)):
             return 1.0, c
-    except TypeError: pass
+    except TypeError:
+        pass
     try:
-        ((a, b, c), d, e) = data # full syntax
+        ((a, b, c), d, e) = data  # full syntax
         if (a is stub and b == "__mul__" and isinstance(c, numbers.Number) and
             d == "__add__" and isinstance(e, numbers.Number)):
             return c, e
-    except TypeError: pass
+    except TypeError:
+        pass
     raise ValueError("illegal expression")
 
 
@@ -495,11 +509,12 @@ class Image:
                 new.info[k] = v
         return new
 
-    _makeself = _new # compatibility
+    _makeself = _new  # compatibility
 
     # Context Manager Support
     def __enter__(self):
         return self
+
     def __exit__(self, *args):
         self.close()
 
@@ -518,14 +533,13 @@ class Image:
             self.fp.close()
         except Exception as msg:
             if Image.DEBUG:
-                print ("Error closing: %s" %msg)
+                print ("Error closing: %s" % msg)
 
         # Instead of simply setting to None, we're setting up a
         # deferred error that will better explain that the core image
         # object is gone.
         self.im = deferred_error(ValueError("Operation on closed image"))
 
-
     def _copy(self):
         self.load()
         self.im = self.im.copy()
@@ -533,7 +547,8 @@ class Image:
         self.readonly = 0
 
     def _dump(self, file=None, format=None):
-        import tempfile, os
+        import os
+        import tempfile
         suffix = ''
         if format:
             suffix = '.'+format
@@ -591,7 +606,7 @@ class Image:
         e = _getencoder(self.mode, encoder_name, args)
         e.setimage(self.im)
 
-        bufsize = max(65536, self.size[0] * 4) # see RawEncode.c
+        bufsize = max(65536, self.size[0] * 4)  # see RawEncode.c
 
         data = []
         while True:
@@ -663,7 +678,9 @@ class Image:
 
         .. deprecated:: 2.0
         """
-        warnings.warn('fromstring() is deprecated. Please call frombytes() instead.', DeprecationWarning)
+        warnings.warn(
+            'fromstring() is deprecated. Please call frombytes() instead.',
+            DeprecationWarning)
         return self.frombytes(*args, **kw)
 
     def load(self):
@@ -779,30 +796,29 @@ class Image:
                 # Use transparent conversion to promote from transparent
                 # color to an alpha channel.
                 return self._new(self.im.convert_transparent(
-                                           mode, self.info['transparency']))
+                    mode, self.info['transparency']))
             elif self.mode in ('L', 'RGB', 'P') and mode in ('L', 'RGB', 'P'):
                 t = self.info['transparency']
                 if isinstance(t, bytes):
                     # Dragons. This can't be represented by a single color
-                    warnings.warn('Palette images with Transparency expressed '+
+                    warnings.warn('Palette images with Transparency expressed ' +
                                   ' in bytes should be converted to RGBA images')
                     delete_trns = True
                 else:
                     # get the new transparency color.
                     # use existing conversions
-                    trns_im = Image()._new(core.new(self.mode, (1,1)))
+                    trns_im = Image()._new(core.new(self.mode, (1, 1)))
                     if self.mode == 'P':
                         trns_im.putpalette(self.palette)
-                    trns_im.putpixel((0,0), t)
+                    trns_im.putpixel((0, 0), t)
 
-                    if mode in ('L','RGB'):
+                    if mode in ('L', 'RGB'):
                         trns_im = trns_im.convert(mode)
                     else:
                         # can't just retrieve the palette number, got to do it
                         # after quantization.
                         trns_im = trns_im.convert('RGB')
-                    trns = trns_im.getpixel((0,0))
-
+                    trns = trns_im.getpixel((0, 0))
 
         if mode == "P" and palette == ADAPTIVE:
             im = self.im.quantize(colors)
@@ -839,7 +855,7 @@ class Image:
 
         new_im = self._new(im)
         if delete_trns:
-            #crash fail if we leave a bytes transparency in an rgb/l mode.
+            # crash fail if we leave a bytes transparency in an rgb/l mode.
             del(new_im.info['transparency'])
         if trns is not None:
             if new_im.mode == 'P':
@@ -1019,7 +1035,7 @@ class Image:
             return out
         return self.im.getcolors(maxcolors)
 
-    def getdata(self, band = None):
+    def getdata(self, band=None):
         """
         Returns the contents of this image as a sequence object
         containing pixel values.  The sequence object is flattened, so
@@ -1040,7 +1056,7 @@ class Image:
         self.load()
         if band is not None:
             return self.im.getband(band)
-        return self.im # could be abused
+        return self.im  # could be abused
 
     def getextrema(self):
         """
@@ -1070,7 +1086,6 @@ class Image:
         self.load()
         return self.im.ptr
 
-
     def getpalette(self):
         """
         Returns the image palette as a list.
@@ -1086,8 +1101,7 @@ class Image:
             else:
                 return list(self.im.getpalette())
         except ValueError:
-            return None # no palette
-
+            return None  # no palette
 
     def getpixel(self, xy):
         """
@@ -1209,7 +1223,8 @@ class Image:
 
         if isImageType(box) and mask is None:
             # abbreviated paste(im, mask) syntax
-            mask = box; box = None
+            mask = box
+            box = None
 
         if box is None:
             # cover all of self
@@ -1315,7 +1330,7 @@ class Image:
                     # do things the hard way
                     im = self.im.convert(mode)
                     if im.mode not in ("LA", "RGBA"):
-                        raise ValueError # sanity check
+                        raise ValueError  # sanity check
                     self.im = im
                     self.pyaccess = None
                 self.mode = self.im.mode
@@ -1393,7 +1408,7 @@ class Image:
         self.mode = "P"
         self.palette = palette
         self.palette.mode = "RGB"
-        self.load() # install new palette
+        self.load()  # install new palette
 
     def putpixel(self, xy, value):
         """
@@ -1422,7 +1437,7 @@ class Image:
             self.load()
 
         if self.pyaccess:
-            return self.pyaccess.putpixel(xy,value)
+            return self.pyaccess.putpixel(xy, value)
         return self.im.putpixel(xy, value)
 
     def resize(self, size, resample=NEAREST):
@@ -1492,6 +1507,7 @@ class Image:
                  math.cos(angle), math.sin(angle), 0.0,
                 -math.sin(angle), math.cos(angle), 0.0
                  ]
+
             def transform(x, y, matrix=matrix):
                 (a, b, c, d, e, f) = matrix
                 return a*x + b*y + c, d*x + e*y + f
@@ -1579,13 +1595,13 @@ class Image:
                 try:
                     format = EXTENSION[ext]
                 except KeyError:
-                    raise KeyError(ext) # unknown extension
+                    raise KeyError(ext)  # unknown extension
 
         try:
             save_handler = SAVE[format.upper()]
         except KeyError:
             init()
-            save_handler = SAVE[format.upper()] # unknown format
+            save_handler = SAVE[format.upper()]  # unknown format
 
         if isPath(fp):
             fp = builtins.open(fp, "wb")
@@ -1682,8 +1698,9 @@ class Image:
         important than quality.
 
         Also note that this function modifies the :py:class:`~PIL.Image.Image`
-        object in place.  If you need to use the full resolution image as well, apply
-        this method to a :py:meth:`~PIL.Image.Image.copy` of the original image.
+        object in place.  If you need to use the full resolution image as well,
+        apply this method to a :py:meth:`~PIL.Image.Image.copy` of the original
+        image.
 
         :param size: Requested size.
         :param resample: Optional resampling filter.  This can be one
@@ -1696,8 +1713,12 @@ class Image:
 
         # preserve aspect ratio
         x, y = self.size
-        if x > size[0]: y = int(max(y * size[0] / x, 1)); x = int(size[0])
-        if y > size[1]: x = int(max(x * size[1] / y, 1)); y = int(size[1])
+        if x > size[0]:
+            y = int(max(y * size[0] / x, 1))
+            x = int(size[0])
+        if y > size[1]:
+            x = int(max(x * size[1] / y, 1))
+            y = int(size[1])
         size = x, y
 
         if size == self.size:
@@ -1712,7 +1733,7 @@ class Image:
         except ValueError:
             if resample != ANTIALIAS:
                 raise
-            im = self.resize(size, NEAREST) # fallback
+            im = self.resize(size, NEAREST)  # fallback
 
         self.im = im.im
         self.mode = im.mode
@@ -1748,7 +1769,9 @@ class Image:
         """
 
         if self.mode == 'RGBA':
-            return self.convert('RGBa').transform(size, method, data, resample, fill).convert('RGBA')
+            return self.convert('RGBa') \
+                .transform(size, method, data, resample, fill) \
+                .convert('RGBA')
 
         if isinstance(method, ImageTransformHandler):
             return method.transform(size, self, resample=resample, fill=fill)
@@ -1795,8 +1818,13 @@ class Image:
         elif method == QUAD:
             # quadrilateral warp.  data specifies the four corners
             # given as NW, SW, SE, and NE.
-            nw = data[0:2]; sw = data[2:4]; se = data[4:6]; ne = data[6:8]
-            x0, y0 = nw; As = 1.0 / w; At = 1.0 / h
+            nw = data[0:2]
+            sw = data[2:4]
+            se = data[4:6]
+            ne = data[6:8]
+            x0, y0 = nw
+            As = 1.0 / w
+            At = 1.0 / h
             data = (x0, (ne[0]-x0)*As, (sw[0]-x0)*At,
                     (se[0]-sw[0]-ne[0]+x0)*As*At,
                     y0, (ne[1]-y0)*As, (sw[1]-y0)*At,
@@ -1830,6 +1858,7 @@ class Image:
         im = self.im.transpose(method)
         return self._new(im)
 
+
 # --------------------------------------------------------------------
 # Lazy operations
 
@@ -1865,6 +1894,7 @@ class _ImageCrop(Image):
         # FIXME: future versions should optimize crop/paste
         # sequences!
 
+
 # --------------------------------------------------------------------
 # Abstract handlers.
 
@@ -1872,10 +1902,12 @@ class ImagePointHandler:
     # used as a mixin by point transforms (for use with im.point)
     pass
 
+
 class ImageTransformHandler:
     # used as a mixin by geometry transforms (for use with im.transform)
     pass
 
+
 # --------------------------------------------------------------------
 # Factories
 
@@ -1951,6 +1983,7 @@ def frombytes(mode, size, data, decoder_name="raw", *args):
     im.frombytes(data, decoder_name, args)
     return im
 
+
 def fromstring(*args, **kw):
     """Deprecated alias to frombytes.
 
@@ -2013,9 +2046,9 @@ def frombuffer(mode, size, data, decoder_name="raw", *args):
                     "  frombuffer(mode, size, data, 'raw', mode, 0, 1)",
                     RuntimeWarning, stacklevel=2
                 )
-            args = mode, 0, -1 # may change to (mode, 0, 1) post-1.1.6
+            args = mode, 0, -1  # may change to (mode, 0, 1) post-1.1.6
         if args[0] in _MAPMODES:
-            im = new(mode, (1,1))
+            im = new(mode, (1, 1))
             im = im._new(
                 core.map_buffer(data, size, decoder_name, None, 0, args)
                 )
@@ -2135,8 +2168,8 @@ def open(fp, mode="r"):
                 fp.seek(0)
                 return factory(fp, filename)
         except (SyntaxError, IndexError, TypeError):
-            #import traceback
-            #traceback.print_exc()
+            # import traceback
+            # traceback.print_exc()
             pass
 
     if init():
@@ -2148,13 +2181,14 @@ def open(fp, mode="r"):
                     fp.seek(0)
                     return factory(fp, filename)
             except (SyntaxError, IndexError, TypeError):
-                #import traceback
-                #traceback.print_exc()
+                # import traceback
+                # traceback.print_exc()
                 pass
 
     raise IOError("cannot identify image file %r"
                   % (filename if filename else fp))
 
+
 #
 # Image processing.
 
@@ -2253,6 +2287,7 @@ def merge(mode, bands):
         im.putband(bands[i].im, i)
     return bands[0]._new(im)
 
+
 # --------------------------------------------------------------------
 # Plugin registry
 
@@ -2311,6 +2346,7 @@ def _show(image, **options):
     # override me, as necessary
     _showxv(image, **options)
 
+
 def _showxv(image, title=None, **options):
     from PIL import ImageShow
     ImageShow.show(image, title, **options)

From f165d2034fc97f172034cadf8c4b3aa3670ae1f3 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Sun, 11 May 2014 09:01:09 +0300
Subject: [PATCH 03/12] Simple test for saving to PDF

---
 Tests/test_file_pdf.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 Tests/test_file_pdf.py

diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
new file mode 100644
index 000000000..7519d270f
--- /dev/null
+++ b/Tests/test_file_pdf.py
@@ -0,0 +1,17 @@
+from tester import *
+import os.path
+
+
+def test_to_pdf():
+    # Arrange
+    im = lena()
+    outfile = tempfile("temp.pdf")
+
+    # Act
+    im.save(outfile)
+
+    # Assert
+    assert_true(os.path.isfile(outfile))
+    assert_greater(os.path.getsize(outfile), 0)
+
+# End of file

From c15601e0b06f5d6ebf28a0f9d6a9721fa54ed235 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Sun, 11 May 2014 17:16:13 +0300
Subject: [PATCH 04/12] Add some more pdf tests

---
 Tests/test_file_pdf.py | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
index 7519d270f..c9ab8015a 100644
--- a/Tests/test_file_pdf.py
+++ b/Tests/test_file_pdf.py
@@ -2,10 +2,10 @@ from tester import *
 import os.path
 
 
-def test_to_pdf():
+def helper_save_as_pdf(mode):
     # Arrange
-    im = lena()
-    outfile = tempfile("temp.pdf")
+    im = lena(mode)
+    outfile = tempfile("temp_" + mode + ".pdf")
 
     # Act
     im.save(outfile)
@@ -14,4 +14,37 @@ def test_to_pdf():
     assert_true(os.path.isfile(outfile))
     assert_greater(os.path.getsize(outfile), 0)
 
+
+def test_greyscale():
+    # Arrange
+    mode = "L"
+
+    # Act / Assert
+    helper_save_as_pdf(mode)
+
+
+def test_rgb():
+    # Arrange
+    mode = "RGB"
+
+    # Act / Assert
+    helper_save_as_pdf(mode)
+
+
+def test_p_mode():
+    # Arrange
+    mode = "P"
+
+    # Act / Assert
+    helper_save_as_pdf(mode)
+
+
+def test_cmyk_mode():
+    # Arrange
+    mode = "P"
+
+    # Act / Assert
+    helper_save_as_pdf(mode)
+
+
 # End of file

From 3e2ff13aa8866af18de64a90e52ee8b7772fd907 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Sun, 11 May 2014 17:23:10 +0300
Subject: [PATCH 05/12] Fix CMYK test

---
 Tests/test_file_pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
index c9ab8015a..81fd919d2 100644
--- a/Tests/test_file_pdf.py
+++ b/Tests/test_file_pdf.py
@@ -41,7 +41,7 @@ def test_p_mode():
 
 def test_cmyk_mode():
     # Arrange
-    mode = "P"
+    mode = "CMYK"
 
     # Act / Assert
     helper_save_as_pdf(mode)

From 8f1a00ae92a949da0859114a970c04d8b7194bc4 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Sun, 11 May 2014 17:28:41 +0300
Subject: [PATCH 06/12] Temporarily remove failing P-mode PDF test

---
 Tests/test_file_pdf.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
index 81fd919d2..4bc70d10c 100644
--- a/Tests/test_file_pdf.py
+++ b/Tests/test_file_pdf.py
@@ -31,12 +31,17 @@ def test_rgb():
     helper_save_as_pdf(mode)
 
 
-def test_p_mode():
-    # Arrange
-    mode = "P"
-
-    # Act / Assert
-    helper_save_as_pdf(mode)
+# FIXME: P-mode test fails on Python 3.
+# https://travis-ci.org/hugovk/Pillow/builds/24915249
+#   File "/home/travis/build/hugovk/Pillow/PIL/PdfImagePlugin.py", line 108, in _save
+#     colorspace = colorspace + b"> ]"
+# TypeError: Can't convert 'bytes' object to str implicitly
+# def test_p_mode():
+#     # Arrange
+#     mode = "P"
+#
+#     # Act / Assert
+#     helper_save_as_pdf(mode)
 
 
 def test_cmyk_mode():

From 6520004289648e3611d43fab7190751f18912aef Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Sun, 11 May 2014 17:35:49 +0300
Subject: [PATCH 07/12] Add monochrome PDF test

---
 Tests/test_file_pdf.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
index 4bc70d10c..ed6b50b5d 100644
--- a/Tests/test_file_pdf.py
+++ b/Tests/test_file_pdf.py
@@ -15,6 +15,14 @@ def helper_save_as_pdf(mode):
     assert_greater(os.path.getsize(outfile), 0)
 
 
+def test_monochrome():
+    # Arrange
+    mode = "1"
+
+    # Act / Assert
+    helper_save_as_pdf(mode)
+
+
 def test_greyscale():
     # Arrange
     mode = "L"
@@ -33,9 +41,11 @@ def test_rgb():
 
 # FIXME: P-mode test fails on Python 3.
 # https://travis-ci.org/hugovk/Pillow/builds/24915249
-#   File "/home/travis/build/hugovk/Pillow/PIL/PdfImagePlugin.py", line 108, in _save
+#   File "/home/travis/build/hugovk/Pillow/PIL/PdfImagePlugin.py", line 108,
+#   in _save
 #     colorspace = colorspace + b"> ]"
 # TypeError: Can't convert 'bytes' object to str implicitly
+
 # def test_p_mode():
 #     # Arrange
 #     mode = "P"

From 741297326a030372fd8dfb6dc6e0a2ecc6dba2f8 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Sun, 11 May 2014 17:41:07 +0300
Subject: [PATCH 08/12] Temporarily remove 'failing' 1-mode PDF test

---
 Tests/test_file_pdf.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
index ed6b50b5d..ddecdd75f 100644
--- a/Tests/test_file_pdf.py
+++ b/Tests/test_file_pdf.py
@@ -15,6 +15,12 @@ def helper_save_as_pdf(mode):
     assert_greater(os.path.getsize(outfile), 0)
 
 
+# FIXME: 1-mode test "fails" because it produces a warning.
+# https://travis-ci.org/hugovk/Pillow/builds/24916085
+# /home/travis/build/hugovk/Pillow/PIL/PdfImagePlugin.py:147:
+# DeprecationWarning: tostring() is deprecated. Please call tobytes() instead.
+#   data = im.tostring("raw", "1")
+
 def test_monochrome():
     # Arrange
     mode = "1"

From bcb8534dcf8ad5e8b10eece136f18062818b7071 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Sun, 11 May 2014 17:46:13 +0300
Subject: [PATCH 09/12] Temporarily remove 'failing' 1-mode PDF test

---
 Tests/test_file_pdf.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
index ddecdd75f..9a4faff3f 100644
--- a/Tests/test_file_pdf.py
+++ b/Tests/test_file_pdf.py
@@ -20,13 +20,13 @@ def helper_save_as_pdf(mode):
 # /home/travis/build/hugovk/Pillow/PIL/PdfImagePlugin.py:147:
 # DeprecationWarning: tostring() is deprecated. Please call tobytes() instead.
 #   data = im.tostring("raw", "1")
-
-def test_monochrome():
-    # Arrange
-    mode = "1"
-
-    # Act / Assert
-    helper_save_as_pdf(mode)
+#
+# def test_monochrome():
+#     # Arrange
+#     mode = "1"
+#
+#     # Act / Assert
+#     helper_save_as_pdf(mode)
 
 
 def test_greyscale():
@@ -51,7 +51,7 @@ def test_rgb():
 #   in _save
 #     colorspace = colorspace + b"> ]"
 # TypeError: Can't convert 'bytes' object to str implicitly
-
+#
 # def test_p_mode():
 #     # Arrange
 #     mode = "P"

From c37aa0a9ca0db921e62ae289f7bc357b7a5aef55 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Mon, 12 May 2014 14:30:03 +0300
Subject: [PATCH 10/12] Fix tostring()/tobytes() warning and reinstate test

---
 PIL/PdfImagePlugin.py  |  2 +-
 Tests/test_file_pdf.py | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/PIL/PdfImagePlugin.py b/PIL/PdfImagePlugin.py
index 725f22ecf..2a8a8d443 100644
--- a/PIL/PdfImagePlugin.py
+++ b/PIL/PdfImagePlugin.py
@@ -144,7 +144,7 @@ def _save(im, fp, filename):
         if bits == 1:
             # FIXME: the hex encoder doesn't support packed 1-bit
             # images; do things the hard way...
-            data = im.tostring("raw", "1")
+            data = im.tobytes("raw", "1")
             im = Image.new("L", (len(data), 1), None)
             im.putdata(data)
         ImageFile._save(im, op, [("hex", (0,0)+im.size, 0, im.mode)])
diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
index 9a4faff3f..e31878aef 100644
--- a/Tests/test_file_pdf.py
+++ b/Tests/test_file_pdf.py
@@ -15,18 +15,12 @@ def helper_save_as_pdf(mode):
     assert_greater(os.path.getsize(outfile), 0)
 
 
-# FIXME: 1-mode test "fails" because it produces a warning.
-# https://travis-ci.org/hugovk/Pillow/builds/24916085
-# /home/travis/build/hugovk/Pillow/PIL/PdfImagePlugin.py:147:
-# DeprecationWarning: tostring() is deprecated. Please call tobytes() instead.
-#   data = im.tostring("raw", "1")
-#
-# def test_monochrome():
-#     # Arrange
-#     mode = "1"
-#
-#     # Act / Assert
-#     helper_save_as_pdf(mode)
+def test_monochrome():
+    # Arrange
+    mode = "1"
+
+    # Act / Assert
+    helper_save_as_pdf(mode)
 
 
 def test_greyscale():

From 8cda5170c8f1c60f5537b623883ef6a9436f2df6 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Mon, 12 May 2014 14:45:54 +0300
Subject: [PATCH 11/12] Fix bytes/str and reinstate test

---
 PIL/PdfImagePlugin.py  |  2 +-
 Tests/test_file_pdf.py | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/PIL/PdfImagePlugin.py b/PIL/PdfImagePlugin.py
index 2a8a8d443..c89ca3ee0 100644
--- a/PIL/PdfImagePlugin.py
+++ b/PIL/PdfImagePlugin.py
@@ -105,7 +105,7 @@ def _save(im, fp, filename):
             g = i8(palette[i*3+1])
             b = i8(palette[i*3+2])
             colorspace = colorspace + "%02x%02x%02x " % (r, g, b)
-        colorspace = colorspace + b"> ]"
+        colorspace = colorspace + "> ]"
         procset = "/ImageI" # indexed color
     elif im.mode == "RGB":
         filter = "/DCTDecode"
diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py
index e31878aef..e99f22db1 100644
--- a/Tests/test_file_pdf.py
+++ b/Tests/test_file_pdf.py
@@ -39,19 +39,12 @@ def test_rgb():
     helper_save_as_pdf(mode)
 
 
-# FIXME: P-mode test fails on Python 3.
-# https://travis-ci.org/hugovk/Pillow/builds/24915249
-#   File "/home/travis/build/hugovk/Pillow/PIL/PdfImagePlugin.py", line 108,
-#   in _save
-#     colorspace = colorspace + b"> ]"
-# TypeError: Can't convert 'bytes' object to str implicitly
-#
-# def test_p_mode():
-#     # Arrange
-#     mode = "P"
-#
-#     # Act / Assert
-#     helper_save_as_pdf(mode)
+def test_p_mode():
+    # Arrange
+    mode = "P"
+
+    # Act / Assert
+    helper_save_as_pdf(mode)
 
 
 def test_cmyk_mode():

From 3ff73688fe12373e4a4d1996962bf107b38a5e89 Mon Sep 17 00:00:00 2001
From: hugovk <hugovk@users.noreply.github.com>
Date: Mon, 12 May 2014 14:56:55 +0300
Subject: [PATCH 12/12] pep8 and pyflakes

---
 PIL/PdfImagePlugin.py | 76 ++++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 30 deletions(-)

diff --git a/PIL/PdfImagePlugin.py b/PIL/PdfImagePlugin.py
index c89ca3ee0..fcc841438 100644
--- a/PIL/PdfImagePlugin.py
+++ b/PIL/PdfImagePlugin.py
@@ -46,9 +46,11 @@ def _obj(fp, obj, **dict):
                 fp.write("/%s %s\n" % (k, v))
         fp.write(">>\n")
 
+
 def _endobj(fp):
     fp.write("endobj\n")
 
+
 ##
 # (Internal) Image save plugin for the PDF format.
 
@@ -59,13 +61,15 @@ def _save(im, fp, filename):
     # make sure image data is available
     im.load()
 
-    xref = [0]*(5+1) # placeholders
+    xref = [0]*(5+1)  # placeholders
 
     class TextWriter:
         def __init__(self, fp):
             self.fp = fp
+
         def __getattr__(self, name):
             return getattr(self.fp, name)
+
         def write(self, value):
             self.fp.write(value.encode('latin-1'))
 
@@ -89,13 +93,13 @@ def _save(im, fp, filename):
     if im.mode == "1":
         filter = "/ASCIIHexDecode"
         colorspace = "/DeviceGray"
-        procset = "/ImageB" # grayscale
+        procset = "/ImageB"  # grayscale
         bits = 1
     elif im.mode == "L":
         filter = "/DCTDecode"
         # params = "<< /Predictor 15 /Columns %d >>" % (width-2)
         colorspace = "/DeviceGray"
-        procset = "/ImageB" # grayscale
+        procset = "/ImageB"  # grayscale
     elif im.mode == "P":
         filter = "/ASCIIHexDecode"
         colorspace = "[ /Indexed /DeviceRGB 255 <"
@@ -106,15 +110,15 @@ def _save(im, fp, filename):
             b = i8(palette[i*3+2])
             colorspace = colorspace + "%02x%02x%02x " % (r, g, b)
         colorspace = colorspace + "> ]"
-        procset = "/ImageI" # indexed color
+        procset = "/ImageI"  # indexed color
     elif im.mode == "RGB":
         filter = "/DCTDecode"
         colorspace = "/DeviceRGB"
-        procset = "/ImageC" # color images
+        procset = "/ImageC"  # color images
     elif im.mode == "CMYK":
         filter = "/DCTDecode"
         colorspace = "/DeviceCMYK"
-        procset = "/ImageC" # color images
+        procset = "/ImageC"  # color images
     else:
         raise ValueError("cannot save mode %s" % im.mode)
 
@@ -122,17 +126,21 @@ def _save(im, fp, filename):
     # catalogue
 
     xref[1] = fp.tell()
-    _obj(fp, 1, Type = "/Catalog",
-                Pages = "2 0 R")
+    _obj(
+        fp, 1,
+        Type="/Catalog",
+        Pages="2 0 R")
     _endobj(fp)
 
     #
     # pages
 
     xref[2] = fp.tell()
-    _obj(fp, 2, Type = "/Pages",
-                Count = 1,
-                Kids = "[4 0 R]")
+    _obj(
+        fp, 2,
+        Type="/Pages",
+        Count=1,
+        Kids="[4 0 R]")
     _endobj(fp)
 
     #
@@ -147,26 +155,28 @@ def _save(im, fp, filename):
             data = im.tobytes("raw", "1")
             im = Image.new("L", (len(data), 1), None)
             im.putdata(data)
-        ImageFile._save(im, op, [("hex", (0,0)+im.size, 0, im.mode)])
+        ImageFile._save(im, op, [("hex", (0, 0)+im.size, 0, im.mode)])
     elif filter == "/DCTDecode":
         Image.SAVE["JPEG"](im, op, filename)
     elif filter == "/FlateDecode":
-        ImageFile._save(im, op, [("zip", (0,0)+im.size, 0, im.mode)])
+        ImageFile._save(im, op, [("zip", (0, 0)+im.size, 0, im.mode)])
     elif filter == "/RunLengthDecode":
-        ImageFile._save(im, op, [("packbits", (0,0)+im.size, 0, im.mode)])
+        ImageFile._save(im, op, [("packbits", (0, 0)+im.size, 0, im.mode)])
     else:
         raise ValueError("unsupported PDF filter (%s)" % filter)
 
     xref[3] = fp.tell()
-    _obj(fp, 3, Type = "/XObject",
-                Subtype = "/Image",
-                Width = width, # * 72.0 / resolution,
-                Height = height, # * 72.0 / resolution,
-                Length = len(op.getvalue()),
-                Filter = filter,
-                BitsPerComponent = bits,
-                DecodeParams = params,
-                ColorSpace = colorspace)
+    _obj(
+        fp, 3,
+        Type="/XObject",
+        Subtype="/Image",
+        Width=width,  # * 72.0 / resolution,
+        Height=height,  # * 72.0 / resolution,
+        Length=len(op.getvalue()),
+        Filter=filter,
+        BitsPerComponent=bits,
+        DecodeParams=params,
+        ColorSpace=colorspace)
 
     fp.write("stream\n")
     fp.fp.write(op.getvalue())
@@ -179,11 +189,14 @@ def _save(im, fp, filename):
 
     xref[4] = fp.tell()
     _obj(fp, 4)
-    fp.write("<<\n/Type /Page\n/Parent 2 0 R\n"\
-             "/Resources <<\n/ProcSet [ /PDF %s ]\n"\
-             "/XObject << /image 3 0 R >>\n>>\n"\
-             "/MediaBox [ 0 0 %d %d ]\n/Contents 5 0 R\n>>\n" %\
-             (procset, int(width * 72.0 /resolution) , int(height * 72.0 / resolution)))
+    fp.write(
+        "<<\n/Type /Page\n/Parent 2 0 R\n"
+        "/Resources <<\n/ProcSet [ /PDF %s ]\n"
+        "/XObject << /image 3 0 R >>\n>>\n"
+        "/MediaBox [ 0 0 %d %d ]\n/Contents 5 0 R\n>>\n" % (
+            procset,
+            int(width * 72.0 / resolution),
+            int(height * 72.0 / resolution)))
     _endobj(fp)
 
     #
@@ -191,10 +204,13 @@ def _save(im, fp, filename):
 
     op = TextWriter(io.BytesIO())
 
-    op.write("q %d 0 0 %d 0 0 cm /image Do Q\n" % (int(width * 72.0 / resolution), int(height * 72.0 / resolution)))
+    op.write(
+        "q %d 0 0 %d 0 0 cm /image Do Q\n" % (
+            int(width * 72.0 / resolution),
+            int(height * 72.0 / resolution)))
 
     xref[5] = fp.tell()
-    _obj(fp, 5, Length = len(op.fp.getvalue()))
+    _obj(fp, 5, Length=len(op.fp.getvalue()))
 
     fp.write("stream\n")
     fp.fp.write(op.fp.getvalue())