From 3ead178d18dab9a6dd74adde6ba1b5ab39b9b9a9 Mon Sep 17 00:00:00 2001 From: hugovk Date: Sun, 29 Jan 2017 18:38:06 +0200 Subject: [PATCH] flake8 --- PIL/Image.py | 45 +++++++++++++++++++++++++++------------------ Tests/test_image.py | 11 ++++++----- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/PIL/Image.py b/PIL/Image.py index 119cc2b08..682fa6056 100644 --- a/PIL/Image.py +++ b/PIL/Image.py @@ -144,6 +144,7 @@ def isImageType(t): """ return hasattr(t, "im") + # # Constants (also defined in _imagingmodule.c!) @@ -339,6 +340,7 @@ def getmodebands(mode): """ return len(ImageMode.getmode(mode).bands) + # -------------------------------------------------------------------- # Helpers @@ -691,8 +693,8 @@ class Image(object): return b"".join(data) def tostring(self, *args, **kw): - raise NotImplementedError("tostring() has been removed. " + - "Please call tobytes() instead.") + raise NotImplementedError("tostring() has been removed. " + "Please call tobytes() instead.") def tobitmap(self, name="image"): """ @@ -742,8 +744,8 @@ class Image(object): raise ValueError("cannot decode image data") def fromstring(self, *args, **kw): - raise NotImplementedError("fromstring() has been removed. " + - "Please call frombytes() instead.") + raise NotImplementedError("fromstring() has been removed. " + "Please call frombytes() instead.") def load(self): """ @@ -879,7 +881,7 @@ class Image(object): try: t = trns_im.palette.getcolor(t) except: - raise ValueError("Couldn't allocate a palette " + + raise ValueError("Couldn't allocate a palette " "color for transparency") trns_im.putpixel((0, 0), t) @@ -1034,8 +1036,7 @@ class Image(object): if y1 < y0: y1 = y0 - return self._new(self.im.crop(( x0, y0, x1, y1))) - + return self._new(self.im.crop((x0, y0, x1, y1))) def draft(self, mode, size): """ @@ -1254,8 +1255,8 @@ class Image(object): return self.im.histogram() def offset(self, xoffset, yoffset=None): - raise NotImplementedError("offset() has been removed. " + - "Please call ImageChops.offset() instead.") + raise NotImplementedError("offset() has been removed. " + "Please call ImageChops.offset() instead.") def paste(self, im, box=None, mask=None): """ @@ -1553,7 +1554,8 @@ class Image(object): return self._new(self.im.resize(size, resample)) - def rotate(self, angle, resample=NEAREST, expand=0, center=None, translate=None): + def rotate(self, angle, resample=NEAREST, expand=0, center=None, + translate=None): """ Returns a rotated copy of this image. This method returns a copy of this image, rotated the given number of degrees counter @@ -1622,10 +1624,13 @@ class Image(object): round(math.cos(angle), 15), round(math.sin(angle), 15), 0.0, round(-math.sin(angle), 15), round(math.cos(angle), 15), 0.0 ] + def transform(x, y, matrix): (a, b, c, d, e, f) = matrix return a*x + b*y + c, d*x + e*y + f - matrix[2], matrix[5] = transform(-center[0] - translate[0], -center[1] - translate[1], matrix) + + matrix[2], matrix[5] = transform(-center[0] - translate[0], + -center[1] - translate[1], matrix) matrix[2] += center[0] matrix[5] += center[1] @@ -1641,9 +1646,11 @@ class Image(object): nh = int(math.ceil(max(yy)) - math.floor(min(yy))) # We multiply a translation matrix from the right. Because of its - # special form, this is the same as taking the image of the translation vector - # as new translation vector. - matrix[2], matrix[5] = transform(-(nw - w) / 2.0, -(nh - h) / 2.0, matrix) + # special form, this is the same as taking the image of the + # translation vector as new translation vector. + matrix[2], matrix[5] = transform(-(nw - w) / 2.0, + -(nh - h) / 2.0, + matrix) w, h = nw, nh return self.transform((w, h), AFFINE, matrix, resample) @@ -1759,8 +1766,8 @@ class Image(object): PPM file, and calls either the **xv** utility or the **display** utility, depending on which one can be found. - On macOS, this method saves the image to a temporary BMP file, and opens - it with the native Preview application. + On macOS, this method saves the image to a temporary BMP file, and + opens it with the native Preview application. On Windows, it saves the image to a temporary BMP file, and uses the standard BMP display utility to show it (usually Paint). @@ -1988,7 +1995,6 @@ class Image(object): return ImageQt.toqpixmap(self) - # -------------------------------------------------------------------- # Abstract handlers. @@ -2013,6 +2019,7 @@ def _wedge(): return Image()._new(core.wedge("L")) + def _check_size(size): """ Common check to enforce type and sanity check on size tuples @@ -2030,6 +2037,7 @@ def _check_size(size): return True + def new(mode, size, color=0): """ Creates a new image with the given mode and size. @@ -2101,7 +2109,7 @@ def frombytes(mode, size, data, decoder_name="raw", *args): def fromstring(*args, **kw): raise NotImplementedError("fromstring() has been removed. " + - "Please call frombytes() instead.") + "Please call frombytes() instead.") def frombuffer(mode, size, data, decoder_name="raw", *args): @@ -2230,6 +2238,7 @@ def fromqpixmap(im): raise ImportError("Qt bindings are not installed") return ImageQt.fromqpixmap(im) + _fromarray_typemap = { # (shape, typestr) => mode, rawmode # first two members of shape are set to one diff --git a/Tests/test_image.py b/Tests/test_image.py index a261584c0..d345ee5da 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -279,21 +279,22 @@ class TestImage(PillowTestCase): self.assert_image_similar(im2, im3, 110) def test_check_size(self): - # Checking that the _check_size function throws value errors when we want it to. + # Checking that the _check_size function throws value errors + # when we want it to. with self.assertRaises(ValueError): Image.new('RGB', 0) # not a tuple with self.assertRaises(ValueError): Image.new('RGB', (0,)) # Tuple too short with self.assertRaises(ValueError): - Image.new('RGB', (-1,-1)) # w,h < 0 + Image.new('RGB', (-1, -1)) # w,h < 0 # this should pass with 0 sized images, #2259 im = Image.new('L', (0, 0)) self.assertEqual(im.size, (0, 0)) - self.assertTrue(Image.new('RGB', (1,1))) + self.assertTrue(Image.new('RGB', (1, 1))) # Should pass lists too - i = Image.new('RGB', [1,1]) + i = Image.new('RGB', [1, 1]) self.assertIsInstance(i.size, tuple) def test_storage_neg(self): @@ -303,7 +304,7 @@ class TestImage(PillowTestCase): # Storage.c, rather than the size check above with self.assertRaises(ValueError): - Image.core.fill('RGB', (2,-2), (0,0,0)) + Image.core.fill('RGB', (2, -2), (0, 0, 0)) def test_offset_not_implemented(self): # Arrange