From 86be744d1fe75726c461d7d8cffa726bebb874e2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 24 Apr 2015 09:41:33 +1000 Subject: [PATCH] Various Flake8 Scripts fixes --- Scripts/enhancer.py | 3 ++- Scripts/explode.py | 6 ++++-- Scripts/gifmaker.py | 8 ++++++-- Scripts/painter.py | 5 +++-- Scripts/pilconvert.py | 7 +++++-- Scripts/pildriver.py | 3 ++- Scripts/pilfile.py | 5 ++++- Scripts/pilfont.py | 3 ++- Scripts/pilprint.py | 11 +++++++---- Scripts/player.py | 4 ++-- Scripts/thresholder.py | 9 +++++---- Scripts/viewer.py | 1 + 12 files changed, 43 insertions(+), 22 deletions(-) diff --git a/Scripts/enhancer.py b/Scripts/enhancer.py index fe250c9f8..34becf873 100644 --- a/Scripts/enhancer.py +++ b/Scripts/enhancer.py @@ -18,6 +18,7 @@ import sys # # enhancer widget + class Enhance(Frame): def __init__(self, master, image, name, enhancer, lo, hi): Frame.__init__(self, master) @@ -25,7 +26,7 @@ class Enhance(Frame): # set up the image self.tkim = ImageTk.PhotoImage(image.mode, image.size) self.enhancer = enhancer(image) - self.update("1.0") # normalize + self.update("1.0") # normalize # image window Label(self, image=self.tkim).pack() diff --git a/Scripts/explode.py b/Scripts/explode.py index b8680f631..0460fa020 100644 --- a/Scripts/explode.py +++ b/Scripts/explode.py @@ -9,11 +9,13 @@ from __future__ import print_function from PIL import Image -import os, sys +import os +import sys + class Interval: - def __init__(self, interval = "0"): + def __init__(self, interval="0"): self.setinterval(interval) diff --git a/Scripts/gifmaker.py b/Scripts/gifmaker.py index bd4de99c1..8777f74f6 100644 --- a/Scripts/gifmaker.py +++ b/Scripts/gifmaker.py @@ -49,20 +49,23 @@ from PIL.GifImagePlugin import getheader, getdata # -------------------------------------------------------------------- # sequence iterator + class image_sequence: def __init__(self, im): self.im = im + def __getitem__(self, ix): try: if ix: self.im.seek(ix) return self.im except EOFError: - raise IndexError # end of sequence + raise IndexError # end of sequence # -------------------------------------------------------------------- # straightforward delta encoding + def makedelta(fp, sequence): """Convert list of image frames to a GIF animation file""" @@ -91,7 +94,7 @@ def makedelta(fp, sequence): if bbox: # compress difference - for s in getdata(im.crop(bbox), offset = bbox[:2]): + for s in getdata(im.crop(bbox), offset=bbox[:2]): fp.write(s) else: @@ -109,6 +112,7 @@ def makedelta(fp, sequence): # -------------------------------------------------------------------- # main hack + def compress(infile, outfile): # open input image, and force loading of first frame diff --git a/Scripts/painter.py b/Scripts/painter.py index 80c4db6a0..6f1c19484 100644 --- a/Scripts/painter.py +++ b/Scripts/painter.py @@ -20,6 +20,7 @@ import sys # # painter widget + class PaintCanvas(Canvas): def __init__(self, master, image): Canvas.__init__(self, master, width=image.size[0], height=image.size[1]) @@ -33,7 +34,7 @@ class PaintCanvas(Canvas): box = x, y, min(xsize, x+tilesize), min(ysize, y+tilesize) tile = ImageTk.PhotoImage(image.crop(box)) self.create_image(x, y, image=tile, anchor=NW) - self.tile[(x,y)] = box, tile + self.tile[(x, y)] = box, tile self.image = image @@ -59,7 +60,7 @@ class PaintCanvas(Canvas): xy, tile = self.tile[(x, y)] tile.paste(self.image.crop(xy)) except KeyError: - pass # outside the image + pass # outside the image self.update_idletasks() # diff --git a/Scripts/pilconvert.py b/Scripts/pilconvert.py index 0341994c9..66b2e5ac2 100644 --- a/Scripts/pilconvert.py +++ b/Scripts/pilconvert.py @@ -15,10 +15,13 @@ from __future__ import print_function -import getopt, string, sys +import getopt +import string +import sys from PIL import Image + def usage(): print("PIL Convert 0.5/1998-12-30 -- convert image files") print("Usage: pilconvert [option] infile outfile") @@ -49,7 +52,7 @@ except getopt.error as v: format = None convert = None -options = { } +options = {} for o, a in opt: diff --git a/Scripts/pildriver.py b/Scripts/pildriver.py index e45b05008..ba2a8c66f 100644 --- a/Scripts/pildriver.py +++ b/Scripts/pildriver.py @@ -52,6 +52,7 @@ from __future__ import print_function from PIL import Image + class PILDriver: verbose = 0 @@ -500,7 +501,7 @@ if __name__ == '__main__': try: import readline except ImportError: - pass # not available on all platforms + pass # not available on all platforms # If we see command-line arguments, interpret them as a stack state # and execute. Otherwise go interactive. diff --git a/Scripts/pilfile.py b/Scripts/pilfile.py index 1b77b0e78..b4fe4942c 100644 --- a/Scripts/pilfile.py +++ b/Scripts/pilfile.py @@ -20,7 +20,9 @@ from __future__ import print_function import site -import getopt, glob, sys +import getopt +import glob +import sys from PIL import Image @@ -59,6 +61,7 @@ for o, a in opt: elif o == "-D": Image.DEBUG += 1 + def globfix(files): # expand wildcards where necessary if sys.platform == "win32": diff --git a/Scripts/pilfont.py b/Scripts/pilfont.py index ec25e7a71..4425c072c 100644 --- a/Scripts/pilfont.py +++ b/Scripts/pilfont.py @@ -14,7 +14,8 @@ from __future__ import print_function VERSION = "0.4" -import glob, sys +import glob +import sys # drivers from PIL import BdfFontFile diff --git a/Scripts/pilprint.py b/Scripts/pilprint.py index 889944de7..d13a2a526 100644 --- a/Scripts/pilprint.py +++ b/Scripts/pilprint.py @@ -12,14 +12,17 @@ # from __future__ import print_function -import getopt, os, sys +import getopt +import os +import sys VERSION = "pilprint 0.3/2003-05-05" from PIL import Image from PIL import PSDraw -letter = ( 1.0*72, 1.0*72, 7.5*72, 10.0*72 ) +letter = (1.0*72, 1.0*72, 7.5*72, 10.0*72) + def description(file, image): title = os.path.splitext(os.path.split(file)[1])[0] @@ -43,8 +46,8 @@ except getopt.error as v: print(v) sys.exit(1) -printer = None # print to stdout -monochrome = 1 # reduce file size for most common case +printer = None # print to stdout +monochrome = 1 # reduce file size for most common case for o, a in opt: if o == "-d": diff --git a/Scripts/player.py b/Scripts/player.py index 0c90286c5..43877415a 100644 --- a/Scripts/player.py +++ b/Scripts/player.py @@ -56,7 +56,7 @@ class UI(Label): del self.im[0] self.image.paste(im) except IndexError: - return # end of list + return # end of list else: @@ -65,7 +65,7 @@ class UI(Label): im.seek(im.tell() + 1) self.image.paste(im) except EOFError: - return # end of file + return # end of file try: duration = im.info["duration"] diff --git a/Scripts/thresholder.py b/Scripts/thresholder.py index 29d4592d9..1e55c5a32 100644 --- a/Scripts/thresholder.py +++ b/Scripts/thresholder.py @@ -18,8 +18,9 @@ import sys # # an image viewer + class UI(Frame): - def __init__(self, master, im, value = 128): + def __init__(self, master, im, value=128): Frame.__init__(self, master) self.image = im @@ -45,16 +46,16 @@ class UI(Frame): self.redraw() - def redraw(self, event = None): + def redraw(self, event=None): # create overlay (note the explicit conversion to mode "1") - im = self.image.point(lambda v,t=self.value: v>=t, "1") + im = self.image.point(lambda v, t=self.value: v >= t, "1") self.overlay = ImageTk.BitmapImage(im, foreground="green") # update canvas self.canvas.delete("overlay") self.canvas.create_image(0, 0, image=self.overlay, anchor=NW, - tags="overlay") + tags="overlay") # -------------------------------------------------------------------- # main diff --git a/Scripts/viewer.py b/Scripts/viewer.py index 86b2526cd..c0fc59d96 100644 --- a/Scripts/viewer.py +++ b/Scripts/viewer.py @@ -16,6 +16,7 @@ from PIL import Image, ImageTk # # an image viewer + class UI(Label): def __init__(self, master, im):