From 59b9d1dc46ec8db95e93f2d2dac4f99bafa79a84 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 6 Jan 2018 21:40:12 +1100 Subject: [PATCH 1/4] Simplified Image.open call --- src/PIL/IcnsImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py index 5c5bd7cf9..21fd558f2 100644 --- a/src/PIL/IcnsImagePlugin.py +++ b/src/PIL/IcnsImagePlugin.py @@ -359,7 +359,7 @@ if __name__ == '__main__': imf.load() im = imf.im im.save('out-%s-%s-%s.png' % size) - im = Image.open(open(sys.argv[1], "rb")) + im = Image.open(sys.argv[1]) im.save("out.png") if sys.platform == 'windows': os.startfile("out.png") From 3c73043509c5c7b2a5e385fcbb5de1a341b4314f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 6 Jan 2018 21:47:14 +1100 Subject: [PATCH 2/4] Simplified use of sys.argv --- src/PIL/SpiderImagePlugin.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index 5e5dde5a6..013560fe9 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -286,7 +286,7 @@ Image.register_save(SpiderImageFile.format, _save_spider) if __name__ == "__main__": - if not sys.argv[1:]: + if len(sys.argv) < 2: print("Syntax: python SpiderImagePlugin.py [infile] [outfile]") sys.exit() @@ -295,10 +295,6 @@ if __name__ == "__main__": print("input image must be in Spider format") sys.exit() - outfile = "" - if len(sys.argv[1:]) > 1: - outfile = sys.argv[2] - im = Image.open(filename) print("image: " + str(im)) print("format: " + str(im.format)) @@ -307,7 +303,9 @@ if __name__ == "__main__": print("max, min: ", end=' ') print(im.getextrema()) - if outfile != "": + if len(sys.argv) > 2: + outfile = sys.argv[2] + # perform some image operation im = im.transpose(Image.FLIP_LEFT_RIGHT) print( From b7aab522e1f022e9f9fd101de1c6a4ad4d580685 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 6 Jan 2018 21:51:45 +1100 Subject: [PATCH 3/4] Added syntax print statements --- src/PIL/IcnsImagePlugin.py | 5 +++++ src/PIL/ImageShow.py | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py index 21fd558f2..7c1bd5882 100644 --- a/src/PIL/IcnsImagePlugin.py +++ b/src/PIL/IcnsImagePlugin.py @@ -353,6 +353,11 @@ if sys.platform == 'darwin': if __name__ == '__main__': + + if len(sys.argv) < 2: + print("Syntax: python IcnsImagePlugin.py [file]") + sys.exit() + imf = IcnsImageFile(open(sys.argv[1], 'rb')) for size in imf.info['sizes']: imf.size = size diff --git a/src/PIL/ImageShow.py b/src/PIL/ImageShow.py index bf8c67eb5..fdd739920 100644 --- a/src/PIL/ImageShow.py +++ b/src/PIL/ImageShow.py @@ -186,5 +186,9 @@ else: register(XVViewer) if __name__ == "__main__": - # usage: python ImageShow.py imagefile [title] + + if len(sys.argv) < 2: + print("Syntax: python ImageShow.py imagefile [title]") + sys.exit() + print(show(Image.open(sys.argv[1]), *sys.argv[2:])) From 696b3819e89d203029a96ae747c034b6d44f7c66 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 6 Jan 2018 21:58:05 +1100 Subject: [PATCH 4/4] Combined two excerpt statements --- src/PIL/SpiderImagePlugin.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index 013560fe9..b65f181d8 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -48,9 +48,7 @@ def isInt(f): return 1 else: return 0 - except ValueError: - return 0 - except OverflowError: + except (ValueError, OverflowError): return 0 iforms = [1, 3, -11, -12, -21, -22]