From 105e96350575f8fed2c046f1a80da993fbe0d984 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 11 Sep 2015 19:28:19 +1000 Subject: [PATCH] Flake8 fixes --- PIL/Image.py | 3 ++- PIL/ImagePalette.py | 2 +- PIL/TiffImagePlugin.py | 2 +- mp_compile.py | 15 ++++++++------- setup.py | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/PIL/Image.py b/PIL/Image.py index bc9fc65d0..0f11ad7a9 100644 --- a/PIL/Image.py +++ b/PIL/Image.py @@ -2313,7 +2313,7 @@ def open(fp, mode="r"): return None im = _open_core(fp, filename, prefix) - + if im is None: if init(): im = _open_core(fp, filename, prefix) @@ -2327,6 +2327,7 @@ def open(fp, mode="r"): # # Image processing. + def alpha_composite(im1, im2): """ Alpha composite im2 over im1. diff --git a/PIL/ImagePalette.py b/PIL/ImagePalette.py index b7a0008a3..598b9b27e 100644 --- a/PIL/ImagePalette.py +++ b/PIL/ImagePalette.py @@ -28,7 +28,7 @@ class ImagePalette(object): :param mode: The mode to use for the Palette. See: :ref:`concept-modes`. Defaults to "RGB" :param palette: An optional palette. If given, it must be a bytearray, - an array or a list of ints between 0-255 and of length ``size`` + an array or a list of ints between 0-255 and of length ``size`` times the number of colors in ``mode``. The list must be aligned by channel (All R values must be contiguous in the list before G and B values.) Defaults to 0 through 255 per channel. diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py index 456991898..b0e7c9639 100644 --- a/PIL/TiffImagePlugin.py +++ b/PIL/TiffImagePlugin.py @@ -551,7 +551,7 @@ class ImageFileDirectory(collections.MutableMapping): # NUL (binary zero). Also, I don't think this was well # exercised before. if sys.version_info[0] == 2: - value = value.decode('ascii','replace') + value = value.decode('ascii', 'replace') data = value = b"" + value.encode('ascii', 'replace') + b"\0" else: # integer data diff --git a/mp_compile.py b/mp_compile.py index 229f9993d..078f62476 100644 --- a/mp_compile.py +++ b/mp_compile.py @@ -54,19 +54,19 @@ def _mp_compile(self, sources, output_dir=None, macros=None, def install(): - fl_pypy3 = hasattr(sys, 'pypy_version_info') and sys.version_info > (3,0) + fl_pypy3 = hasattr(sys, 'pypy_version_info') and sys.version_info > (3, 0) fl_win = sys.platform.startswith('win') - + if fl_pypy3: # see https://github.com/travis-ci/travis-ci/issues/3587 print("Single threaded build for pypy3") return - + if fl_win: #windows barfs on multiprocessing installs print("Single threaded build for windows") return - + if MAX_PROCS != 1: # explicitly don't enable if environment says 1 processor try: @@ -75,9 +75,10 @@ def install(): pool = Pool(2) CCompiler.compile = _mp_compile except Exception as msg: - print("Exception installing mp_compile, proceeding without: %s" % msg) + print("Exception installing mp_compile, proceeding without:" + "%s" % msg) else: - print("Single threaded build, not installing mp_compile: %s processes" % - MAX_PROCS) + print("Single threaded build, not installing mp_compile:" + "%s processes" % MAX_PROCS) install() diff --git a/setup.py b/setup.py index adeae9f56..bf8ec94a7 100644 --- a/setup.py +++ b/setup.py @@ -308,7 +308,7 @@ class pil_build_ext(build_ext): elif sys.platform.startswith("sunos5"): _add_directory(library_dirs, "/opt/local/lib") _add_directory(include_dirs, "/opt/local/include") - + # FIXME: check /opt/stuff directories here? # locate tkinter libraries