python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 01:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4712 from cool-RR/2020-06-12-raise-from

Browse Source 
Fix exception causes all over the codebase
This commit is contained in:
Andrew Murray 2020-06-28 15:22:05 +10:00 committed by GitHub
commit 4ae694cd7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 125 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/example/DdsImagePlugin.py
View File

@ -249,8 +249,8 @@ class DXT1Decoder(ImageFile.PyDecoder):
def decode(self, buffer):
try:
self.set_as_raw(_dxt1(self.fd, self.state.xsize, self.state.ysize))
except struct.error:
raise OSError("Truncated DDS file")
except struct.error as e:
raise OSError("Truncated DDS file") from e
return 0, 0
@ -260,8 +260,8 @@ class DXT5Decoder(ImageFile.PyDecoder):
def decode(self, buffer):
try:
self.set_as_raw(_dxt5(self.fd, self.state.xsize, self.state.ysize))
except struct.error:
raise OSError("Truncated DDS file")
except struct.error as e:
raise OSError("Truncated DDS file") from e
return 0, 0

4
src/PIL/BlpImagePlugin.py
View File

@ -282,8 +282,8 @@ class _BLPBaseDecoder(ImageFile.PyDecoder):
self.magic = self.fd.read(4)
self._read_blp_header()
self._load()
except struct.error:
raise OSError("Truncated Blp file")
except struct.error as e:
raise OSError("Truncated Blp file") from e
return 0, 0
def _read_palette(self):

4
src/PIL/BmpImagePlugin.py
View File

@ -304,8 +304,8 @@ def _dib_save(im, fp, filename):
def _save(im, fp, filename, bitmap_header=True):
try:
rawmode, bits, colors = SAVE[im.mode]
except KeyError:
raise OSError("cannot write mode %s as BMP" % im.mode)
except KeyError as e:
raise OSError("cannot write mode %s as BMP" % im.mode) from e
info = im.encoderinfo

4
src/PIL/EpsImagePlugin.py
View File

@ -231,8 +231,8 @@ class EpsImageFile(ImageFile.ImageFile):
try:
m = split.match(s)
except re.error:
raise SyntaxError("not an EPS file")
except re.error as e:
raise SyntaxError("not an EPS file") from e
if m:
k, v = m.group(1, 2)

4
src/PIL/FpxImagePlugin.py
View File

@ -59,8 +59,8 @@ class FpxImageFile(ImageFile.ImageFile):
try:
self.ole = olefile.OleFileIO(self.fp)
except OSError:
raise SyntaxError("not an FPX file; invalid OLE file")
except OSError as e:
raise SyntaxError("not an FPX file; invalid OLE file") from e
if self.ole.root.clsid != "56616700-C154-11CE-8553-00AA00A1F95B":
raise SyntaxError("not an FPX file; bad root CLSID")

4
src/PIL/GdImageFile.py
View File

@ -85,5 +85,5 @@ def open(fp, mode="r"):
try:
return GdImageFile(fp)
except SyntaxError:
raise UnidentifiedImageError("cannot identify this image file")
except SyntaxError as e:
raise UnidentifiedImageError("cannot identify this image file") from e

4
src/PIL/GifImagePlugin.py
View File

@ -130,9 +130,9 @@ class GifImageFile(ImageFile.ImageFile):
for f in range(self.__frame + 1, frame + 1):
try:
self._seek(f)
except EOFError:
except EOFError as e:
self.seek(last_frame)
raise EOFError("no more images in GIF file")
raise EOFError("no more images in GIF file") from e
def _seek(self, frame):

8
src/PIL/ImImagePlugin.py
View File

@ -163,8 +163,8 @@ class ImImageFile(ImageFile.ImageFile):
try:
m = split.match(s)
except re.error:
raise SyntaxError("not an IM file")
except re.error as e:
raise SyntaxError("not an IM file") from e
if m:
@ -341,8 +341,8 @@ def _save(im, fp, filename):
try:
image_type, rawmode = SAVE[im.mode]
except KeyError:
raise ValueError("Cannot save %s images as IM" % im.mode)
except KeyError as e:
raise ValueError("Cannot save %s images as IM" % im.mode) from e
frames = im.encoderinfo.get("frames", 1)

40
src/PIL/Image.py
View File

@ -434,8 +434,8 @@ def _getdecoder(mode, decoder_name, args, extra=()):
try:
# get decoder
decoder = getattr(core, decoder_name + "_decoder")
except AttributeError:
raise OSError("decoder %s not available" % decoder_name)
except AttributeError as e:
raise OSError("decoder %s not available" % decoder_name) from e
return decoder(mode, *args + extra)
@ -457,8 +457,8 @@ def _getencoder(mode, encoder_name, args, extra=()):
try:
# get encoder
encoder = getattr(core, encoder_name + "_encoder")
except AttributeError:
raise OSError("encoder %s not available" % encoder_name)
except AttributeError as e:
raise OSError("encoder %s not available" % encoder_name) from e
return encoder(mode, *args + extra)
@ -971,10 +971,10 @@ class Image:
if isinstance(t, tuple):
try:
t = trns_im.palette.getcolor(t)
except Exception:
except Exception as e:
raise ValueError(
"Couldn't allocate a palette color for transparency"
)
) from e
trns_im.putpixel((0, 0), t)
if mode in ("L", "RGB"):
@ -1027,8 +1027,8 @@ class Image:
# normalize source image and try again
im = self.im.convert(getmodebase(self.mode))
im = im.convert(mode, dither)
except KeyError:
raise ValueError("illegal conversion")
except KeyError as e:
raise ValueError("illegal conversion") from e
new_im = self._new(im)
if delete_trns:
@ -1625,16 +1625,16 @@ class Image:
mode = getmodebase(self.mode) + "A"
try:
self.im.setmode(mode)
except (AttributeError, ValueError):
except (AttributeError, ValueError) as e:
# do things the hard way
im = self.im.convert(mode)
if im.mode not in ("LA", "PA", "RGBA"):
raise ValueError # sanity check
raise ValueError from e # sanity check
self.im = im
self.pyaccess = None
self.mode = self.im.mode
except (KeyError, ValueError):
raise ValueError("illegal image mode")
except (KeyError, ValueError) as e:
raise ValueError("illegal image mode") from e
if self.mode in ("LA", "PA"):
band = 1
@ -2136,8 +2136,8 @@ class Image:
init()
try:
format = EXTENSION[ext]
except KeyError:
raise ValueError("unknown file extension: {}".format(ext))
except KeyError as e:
raise ValueError("unknown file extension: {}".format(ext)) from e
if format.upper() not in SAVE:
init()
@ -2245,8 +2245,8 @@ class Image:
if isinstance(channel, str):
try:
channel = self.getbands().index(channel)
except ValueError:
raise ValueError('The image has no channel "{}"'.format(channel))
except ValueError as e:
raise ValueError('The image has no channel "{}"'.format(channel)) from e
return self._new(self.im.getband(channel))
@ -2743,12 +2743,12 @@ def fromarray(obj, mode=None):
if mode is None:
try:
typekey = (1, 1) + shape[2:], arr["typestr"]
except KeyError:
raise TypeError("Cannot handle this data type")
except KeyError as e:
raise TypeError("Cannot handle this data type") from e
try:
mode, rawmode = _fromarray_typemap[typekey]
except KeyError:
raise TypeError("Cannot handle this data type: %s, %s" % typekey)
except KeyError as e:
raise TypeError("Cannot handle this data type: %s, %s" % typekey) from e
else:
rawmode = mode
if mode in ["1", "L", "I", "P", "F"]:

32
src/PIL/ImageCms.py
View File

@ -369,7 +369,7 @@ def profileToProfile(
else:
imOut = transform.apply(im)
except (OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
return imOut
@ -393,7 +393,7 @@ def getOpenProfile(profileFilename):
try:
return ImageCmsProfile(profileFilename)
except (OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def buildTransform(
@ -474,7 +474,7 @@ def buildTransform(
inputProfile, outputProfile, inMode, outMode, renderingIntent, flags=flags
)
except (OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def buildProofTransform(
@ -585,7 +585,7 @@ def buildProofTransform(
flags,
)
except (OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
buildTransformFromOpenProfiles = buildTransform
@ -640,7 +640,7 @@ def applyTransform(im, transform, inPlace=False):
else:
imOut = transform.apply(im)
except (TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
return imOut
@ -682,15 +682,15 @@ def createProfile(colorSpace, colorTemp=-1):
if colorSpace == "LAB":
try:
colorTemp = float(colorTemp)
except (TypeError, ValueError):
except (TypeError, ValueError) as e:
raise PyCMSError(
'Color temperature must be numeric, "%s" not valid' % colorTemp
)
) from e
try:
return core.createProfile(colorSpace, colorTemp)
except (TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def getProfileName(profile):
@ -732,7 +732,7 @@ def getProfileName(profile):
return "{} - {}\n".format(model, manufacturer)
except (AttributeError, OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def getProfileInfo(profile):
@ -772,7 +772,7 @@ def getProfileInfo(profile):
return "\r\n\r\n".join(arr) + "\r\n\r\n"
except (AttributeError, OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def getProfileCopyright(profile):
@ -800,7 +800,7 @@ def getProfileCopyright(profile):
profile = ImageCmsProfile(profile)
return (profile.profile.copyright or "") + "\n"
except (AttributeError, OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def getProfileManufacturer(profile):
@ -828,7 +828,7 @@ def getProfileManufacturer(profile):
profile = ImageCmsProfile(profile)
return (profile.profile.manufacturer or "") + "\n"
except (AttributeError, OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def getProfileModel(profile):
@ -857,7 +857,7 @@ def getProfileModel(profile):
profile = ImageCmsProfile(profile)
return (profile.profile.model or "") + "\n"
except (AttributeError, OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def getProfileDescription(profile):
@ -886,7 +886,7 @@ def getProfileDescription(profile):
profile = ImageCmsProfile(profile)
return (profile.profile.profile_description or "") + "\n"
except (AttributeError, OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def getDefaultIntent(profile):
@ -925,7 +925,7 @@ def getDefaultIntent(profile):
profile = ImageCmsProfile(profile)
return profile.profile.rendering_intent
except (AttributeError, OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def isIntentSupported(profile, intent, direction):
@ -976,7 +976,7 @@ def isIntentSupported(profile, intent, direction):
else:
return -1
except (AttributeError, OSError, TypeError, ValueError) as v:
raise PyCMSError(v)
raise PyCMSError(v) from v
def versions():

10
src/PIL/ImageFile.py
View File

@ -122,7 +122,7 @@ class ImageFile(Image.Image):
EOFError, # got header but not the first frame
struct.error,
) as v:
raise SyntaxError(v)
raise SyntaxError(v) from v
if not self.mode or self.size[0] <= 0:
raise SyntaxError("not identified by this driver")
@ -241,12 +241,12 @@ class ImageFile(Image.Image):
while True:
try:
s = read(self.decodermaxblock)
except (IndexError, struct.error):
except (IndexError, struct.error) as e:
# truncated png/gif
if LOAD_TRUNCATED_IMAGES:
break
else:
raise OSError("image file is truncated")
raise OSError("image file is truncated") from e
if not s: # truncated jpeg
if LOAD_TRUNCATED_IMAGES:
@ -505,7 +505,7 @@ def _save(im, fp, tile, bufsize=0):
try:
fh = fp.fileno()
fp.flush()
except (AttributeError, io.UnsupportedOperation):
except (AttributeError, io.UnsupportedOperation) as e:
# compress to Python file-compatible object
for e, b, o, a in tile:
e = Image._getencoder(im.mode, e, a, im.encoderconfig)
@ -522,7 +522,7 @@ def _save(im, fp, tile, bufsize=0):
if s:
break
if s < 0:
raise OSError("encoder error %d when writing image file" % s)
raise OSError("encoder error %d when writing image file" % s) from e
e.cleanup()
else:
# slight speedup: compress to real file object

4
src/PIL/ImageFilter.py
View File

@ -411,10 +411,10 @@ class Color3DLUT(MultibandFilter):
def _check_size(size):
try:
_, _, _ = size
except ValueError:
except ValueError as e:
raise ValueError(
"Size should be either an integer or a tuple of three integers."
)
) from e
except TypeError:
size = (size, size, size)
size = [int(x) for x in size]

12
src/PIL/ImageFont.py
View File

@ -505,8 +505,8 @@ class FreeTypeFont:
"""
try:
names = self.font.getvarnames()
except AttributeError:
raise NotImplementedError("FreeType 2.9.1 or greater is required")
except AttributeError as e:
raise NotImplementedError("FreeType 2.9.1 or greater is required") from e
return [name.replace(b"\x00", b"") for name in names]
def set_variation_by_name(self, name):
@ -535,8 +535,8 @@ class FreeTypeFont:
"""
try:
axes = self.font.getvaraxes()
except AttributeError:
raise NotImplementedError("FreeType 2.9.1 or greater is required")
except AttributeError as e:
raise NotImplementedError("FreeType 2.9.1 or greater is required") from e
for axis in axes:
axis["name"] = axis["name"].replace(b"\x00", b"")
return axes
@ -548,8 +548,8 @@ class FreeTypeFont:
"""
try:
self.font.setvaraxes(axes)
except AttributeError:
raise NotImplementedError("FreeType 2.9.1 or greater is required")
except AttributeError as e:
raise NotImplementedError("FreeType 2.9.1 or greater is required") from e
class TransposedFont:

8
src/PIL/ImageMath.py
View File

@ -57,8 +57,8 @@ class _Operand:
im1.load()
try:
op = getattr(_imagingmath, op + "_" + im1.mode)
except AttributeError:
raise TypeError("bad operand type for '%s'" % op)
except AttributeError as e:
raise TypeError("bad operand type for '%s'" % op) from e
_imagingmath.unop(op, out.im.id, im1.im.id)
else:
# binary operation
@ -85,8 +85,8 @@ class _Operand:
im2.load()
try:
op = getattr(_imagingmath, op + "_" + im1.mode)
except AttributeError:
raise TypeError("bad operand type for '%s'" % op)
except AttributeError as e:
raise TypeError("bad operand type for '%s'" % op) from e
_imagingmath.binop(op, out.im.id, im1.im.id, im2.im.id)
return _Operand(out)

4
src/PIL/ImagePalette.py
View File

@ -97,13 +97,13 @@ class ImagePalette:
if isinstance(color, tuple):
try:
return self.colors[color]
except KeyError:
except KeyError as e:
# allocate new color slot
if isinstance(self.palette, bytes):
self.palette = bytearray(self.palette)
index = len(self.colors)
if index >= 256:
raise ValueError("cannot allocate more than 256 colors")
raise ValueError("cannot allocate more than 256 colors") from e
self.colors[color] = index
self.palette[index] = color[0]
self.palette[index + 256] = color[1]

8
src/PIL/ImageSequence.py
View File

@ -38,8 +38,8 @@ class Iterator:
try:
self.im.seek(ix)
return self.im
except EOFError:
raise IndexError # end of sequence
except EOFError as e:
raise IndexError from e # end of sequence
def __iter__(self):
return self
@ -49,8 +49,8 @@ class Iterator:
self.im.seek(self.position)
self.position += 1
return self.im
except EOFError:
raise StopIteration
except EOFError as e:
raise StopIteration from e
def all_frames(im, func=None):

4
src/PIL/IptcImagePlugin.py
View File

@ -118,8 +118,8 @@ class IptcImageFile(ImageFile.ImageFile):
# compression
try:
compression = COMPRESSION[self.getint((3, 120))]
except KeyError:
raise OSError("Unknown IPTC image compression")
except KeyError as e:
raise OSError("Unknown IPTC image compression") from e
# tile
if tag == (8, 10):

24
src/PIL/JpegImagePlugin.py
View File

@ -505,13 +505,13 @@ def _getmp(self):
file_contents.seek(info.next)
info.load(file_contents)
mp = dict(info)
except Exception:
raise SyntaxError("malformed MP Index (unreadable directory)")
except Exception as e:
raise SyntaxError("malformed MP Index (unreadable directory)") from e
# it's an error not to have a number of images
try:
quant = mp[0xB001]
except KeyError:
raise SyntaxError("malformed MP Index (no number of images)")
except KeyError as e:
raise SyntaxError("malformed MP Index (no number of images)") from e
# get MP entries
mpentries = []
try:
@ -547,8 +547,8 @@ def _getmp(self):
mpentry["Attribute"] = mpentryattr
mpentries.append(mpentry)
mp[0xB002] = mpentries
except KeyError:
raise SyntaxError("malformed MP Index (bad MP Entry)")
except KeyError as e:
raise SyntaxError("malformed MP Index (bad MP Entry)") from e
# Next we should try and parse the individual image unique ID list;
# we don't because I've never seen this actually used in a real MPO
# file and so can't test it.
@ -612,8 +612,8 @@ def _save(im, fp, filename):
try:
rawmode = RAWMODE[im.mode]
except KeyError:
raise OSError("cannot write mode %s as JPEG" % im.mode)
except KeyError as e:
raise OSError("cannot write mode %s as JPEG" % im.mode) from e
info = im.encoderinfo
@ -665,8 +665,8 @@ def _save(im, fp, filename):
for line in qtables.splitlines()
for num in line.split("#", 1)[0].split()
]
except ValueError:
raise ValueError("Invalid quantization table")
except ValueError as e:
raise ValueError("Invalid quantization table") from e
else:
qtables = [lines[s : s + 64] for s in range(0, len(lines), 64)]
if isinstance(qtables, (tuple, list, dict)):
@ -681,8 +681,8 @@ def _save(im, fp, filename):
if len(table) != 64:
raise TypeError
table = array.array("B", table)
except TypeError:
raise ValueError("Invalid quantization table")
except TypeError as e:
raise ValueError("Invalid quantization table") from e
else:
qtables[idx] = list(table)
return qtables

8
src/PIL/MicImagePlugin.py
View File

@ -46,8 +46,8 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
try:
self.ole = olefile.OleFileIO(self.fp)
except OSError:
raise SyntaxError("not an MIC file; invalid OLE file")
except OSError as e:
raise SyntaxError("not an MIC file; invalid OLE file") from e
# find ACI subfiles with Image members (maybe not the
# best way to identify MIC files, but what the... ;-)
@ -77,8 +77,8 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
return
try:
filename = self.images[frame]
except IndexError:
raise EOFError("no such frame")
except IndexError as e:
raise EOFError("no such frame") from e
self.fp = self.ole.openstream(filename)

8
src/PIL/MspImagePlugin.py
View File

@ -116,8 +116,8 @@ class MspDecoder(ImageFile.PyDecoder):
rowmap = struct.unpack_from(
"<%dH" % (self.state.ysize), self.fd.read(self.state.ysize * 2)
)
except struct.error:
raise OSError("Truncated MSP file in row map")
except struct.error as e:
raise OSError("Truncated MSP file in row map") from e
for x, rowlen in enumerate(rowmap):
try:
@ -142,8 +142,8 @@ class MspDecoder(ImageFile.PyDecoder):
img.write(row[idx : idx + runcount])
idx += runcount
except struct.error:
raise OSError("Corrupted MSP file in row %d" % x)
except struct.error as e:
raise OSError("Corrupted MSP file in row %d" % x) from e
self.set_as_raw(img.getvalue(), ("1", 0, 1))

4
src/PIL/PcxImagePlugin.py
View File

@ -131,8 +131,8 @@ def _save(im, fp, filename):
try:
version, bits, planes, rawmode = SAVE[im.mode]
except KeyError:
raise ValueError("Cannot save %s images as PCX" % im.mode)
except KeyError as e:
raise ValueError("Cannot save %s images as PCX" % im.mode) from e
# bytes per plane
stride = (im.size[0] * bits + 7) // 8

18
src/PIL/PngImagePlugin.py
View File

@ -168,8 +168,10 @@ class ChunkStream:
crc2 = i32(self.fp.read(4))
if crc1 != crc2:
raise SyntaxError("broken PNG file (bad header checksum in %r)" % cid)
except struct.error:
raise SyntaxError("broken PNG file (incomplete checksum in %r)" % cid)
except struct.error as e:
raise SyntaxError(
"broken PNG file (incomplete checksum in %r)" % cid
) from e
def crc_skip(self, cid, data):
"""Read checksum. Used if the C module is not present"""
@ -186,8 +188,8 @@ class ChunkStream:
while True:
try:
cid, pos, length = self.read()
except struct.error:
raise OSError("truncated PNG file")
except struct.error as e:
raise OSError("truncated PNG file") from e
if cid == endchunk:
break
@ -737,9 +739,9 @@ class PngImageFile(ImageFile.ImageFile):
for f in range(self.__frame + 1, frame + 1):
try:
self._seek(f)
except EOFError:
except EOFError as e:
self.seek(last_frame)
raise EOFError("no more images in APNG file")
raise EOFError("no more images in APNG file") from e
def _seek(self, frame, rewind=False):
if frame == 0:
@ -1168,8 +1170,8 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
# get the corresponding PNG mode
try:
rawmode, mode = _OUTMODES[mode]
except KeyError:
raise OSError("cannot write mode %s as PNG" % mode)
except KeyError as e:
raise OSError("cannot write mode %s as PNG" % mode) from e
#
# write minimal PNG file

4
src/PIL/PsdImagePlugin.py
View File

@ -144,8 +144,8 @@ class PsdImageFile(ImageFile.ImageFile):
self.frame = layer
self.fp = self.__fp
return name, bbox
except IndexError:
raise EOFError("no such layer")
except IndexError as e:
raise EOFError("no such layer") from e
def tell(self):
# return layer number (0=image, 1..max=layers)

4
src/PIL/SpiderImagePlugin.py
View File

@ -111,8 +111,8 @@ class SpiderImageFile(ImageFile.ImageFile):
hdrlen = isSpiderHeader(t)
if hdrlen == 0:
raise SyntaxError("not a valid Spider file")
except struct.error:
raise SyntaxError("not a valid Spider file")
except struct.error as e:
raise SyntaxError("not a valid Spider file") from e
h = (99,) + t # add 1 value : spider header index starts at 1
iform = int(h[5])

4
src/PIL/TgaImagePlugin.py
View File

@ -167,8 +167,8 @@ def _save(im, fp, filename):
try:
rawmode, bits, colormaptype, imagetype = SAVE[im.mode]
except KeyError:
raise OSError("cannot write mode %s as TGA" % im.mode)
except KeyError as e:
raise OSError("cannot write mode %s as TGA" % im.mode) from e
if "rle" in im.encoderinfo:
rle = im.encoderinfo["rle"]

12
src/PIL/TiffImagePlugin.py
View File

@ -1117,8 +1117,8 @@ class TiffImageFile(ImageFile.ImageFile):
)
try:
decoder.setimage(self.im, extents)
except ValueError:
raise OSError("Couldn't set the image")
except ValueError as e:
raise OSError("Couldn't set the image") from e
close_self_fp = self._exclusive_fp and not self.is_animated
if hasattr(self.fp, "getvalue"):
@ -1231,9 +1231,9 @@ class TiffImageFile(ImageFile.ImageFile):
logger.debug("format key: {}".format(key))
try:
self.mode, rawmode = OPEN_INFO[key]
except KeyError:
except KeyError as e:
logger.debug("- unsupported format")
raise SyntaxError("unknown pixel mode")
raise SyntaxError("unknown pixel mode") from e
logger.debug("- raw mode: {}".format(rawmode))
logger.debug("- pil mode: {}".format(self.mode))
@ -1400,8 +1400,8 @@ def _save(im, fp, filename):
try:
rawmode, prefix, photo, format, bits, extra = SAVE_INFO[im.mode]
except KeyError:
raise OSError("cannot write mode %s as TIFF" % im.mode)
except KeyError as e:
raise OSError("cannot write mode %s as TIFF" % im.mode) from e
ifd = ImageFileDirectory_v2(prefix=prefix)