python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-09 14:54:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reduce duplicate code in Image open

Browse Source
This commit is contained in:
Andrew Murray 2015-08-25 22:25:19 +10:00
parent 926a08cdb3
commit 53a966d80f
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PIL/Image.py
View File

@ -2299,29 +2299,18 @@ def open(fp, mode="r"):
preinit() preinit()
for i in ID: for i in range(0, 2):
try: if i == 0 or init():
factory, accept = OPEN[i] for i in ID:
if not accept or accept(prefix): try:
fp.seek(0) factory, accept = OPEN[i]
im = factory(fp, filename) if not accept or accept(prefix):
_decompression_bomb_check(im.size) fp.seek(0)
return im im = factory(fp, filename)
except (SyntaxError, IndexError, TypeError, struct.error): _decompression_bomb_check(im.size)
logger.debug("", exc_info=True) return im
except (SyntaxError, IndexError, TypeError, struct.error):
if init(): logger.debug("", exc_info=True)
for i in ID:
try:
factory, accept = OPEN[i]
if not accept or accept(prefix):
fp.seek(0)
im = factory(fp, filename)
_decompression_bomb_check(im.size)
return im
except (SyntaxError, IndexError, TypeError, struct.error):
logger.debug("", exc_info=True)
raise IOError("cannot identify image file %r" raise IOError("cannot identify image file %r"
% (filename if filename else fp)) % (filename if filename else fp))