Skip to content

Commit a10dec0

Browse files
authored
Merge pull request #7480 from radarhere/lint
2 parents 0a6fcc2 + e760b02 commit a10dec0

File tree

10 files changed

+35
-21
lines changed

10 files changed

+35
-21
lines changed

Tests/test_file_palm.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ def open_with_magick(magick, tmp_path, f):
2626
rc = subprocess.call(
2727
magick + [f, outfile], stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT
2828
)
29-
if rc:
30-
raise OSError
29+
assert not rc
3130
return Image.open(outfile)
3231

3332

src/PIL/FliImagePlugin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ def _seek(self, frame):
150150

151151
s = self.fp.read(4)
152152
if not s:
153-
raise EOFError
153+
msg = "missing frame size"
154+
raise EOFError(msg)
154155

155156
framesize = i32(s)
156157

src/PIL/GifImagePlugin.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ def _seek(self, frame, update_image=True):
183183

184184
s = self.fp.read(1)
185185
if not s or s == b";":
186-
raise EOFError
186+
msg = "no more images in GIF file"
187+
raise EOFError(msg)
187188

188189
palette = None
189190

@@ -288,7 +289,8 @@ def _seek(self, frame, update_image=True):
288289

289290
if interlace is None:
290291
# self._fp = None
291-
raise EOFError
292+
msg = "image not found in GIF frame"
293+
raise EOFError(msg)
292294

293295
self.__frame = frame
294296
if not update_image:

src/PIL/Image.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,7 +1862,8 @@ def putalpha(self, alpha):
18621862
# do things the hard way
18631863
im = self.im.convert(mode)
18641864
if im.mode not in ("LA", "PA", "RGBA"):
1865-
raise ValueError from e # sanity check
1865+
msg = "alpha channel could not be added"
1866+
raise ValueError(msg) from e # sanity check
18661867
self.im = im
18671868
self.pyaccess = None
18681869
self._mode = self.im.mode
@@ -2467,7 +2468,8 @@ def seek(self, frame):
24672468

24682469
# overridden by file handlers
24692470
if frame != 0:
2470-
raise EOFError
2471+
msg = "no more images in file"
2472+
raise EOFError(msg)
24712473

24722474
def show(self, title=None):
24732475
"""

src/PIL/ImageFile.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ def load(self):
200200
with open(self.filename) as fp:
201201
self.map = mmap.mmap(fp.fileno(), 0, access=mmap.ACCESS_READ)
202202
if offset + self.size[1] * args[1] > self.map.size():
203-
# buffer is not large enough
204-
raise OSError
203+
msg = "buffer is not large enough"
204+
raise OSError(msg)
205205
self.im = Image.core.map_buffer(
206206
self.map, self.size, decoder_name, offset, args
207207
)
@@ -690,7 +690,8 @@ def decode(self, buffer):
690690
If finished with decoding return -1 for the bytes consumed.
691691
Err codes are from :data:`.ImageFile.ERRORS`.
692692
"""
693-
raise NotImplementedError()
693+
msg = "unavailable in base decoder"
694+
raise NotImplementedError(msg)
694695

695696
def set_as_raw(self, data, rawmode=None):
696697
"""
@@ -739,7 +740,8 @@ def encode(self, bufsize):
739740
If finished with encoding return 1 for the error code.
740741
Err codes are from :data:`.ImageFile.ERRORS`.
741742
"""
742-
raise NotImplementedError()
743+
msg = "unavailable in base encoder"
744+
raise NotImplementedError(msg)
743745

744746
def encode_to_pyfd(self):
745747
"""

src/PIL/ImagePalette.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ def make_linear_lut(black, white):
205205
for i in range(256):
206206
lut.append(white * i // 255)
207207
else:
208-
raise NotImplementedError # FIXME
208+
msg = "unavailable when black is non-zero"
209+
raise NotImplementedError(msg) # FIXME
209210
return lut
210211

211212

src/PIL/ImageSequence.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ def __getitem__(self, ix):
4040
self.im.seek(ix)
4141
return self.im
4242
except EOFError as e:
43-
raise IndexError from e # end of sequence
43+
msg = "end of sequence"
44+
raise IndexError(msg) from e
4445

4546
def __iter__(self):
4647
return self
@@ -51,7 +52,8 @@ def __next__(self):
5152
self.position += 1
5253
return self.im
5354
except EOFError as e:
54-
raise StopIteration from e
55+
msg = "end of sequence"
56+
raise StopIteration(msg) from e
5557

5658

5759
def all_frames(im, func=None):

src/PIL/ImageShow.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ def get_command(self, file, **options):
9999
Returns the command used to display the file.
100100
Not implemented in the base class.
101101
"""
102-
raise NotImplementedError
102+
msg = "unavailable in base viewer"
103+
raise NotImplementedError(msg)
103104

104105
def save_image(self, image):
105106
"""Save to temporary file and return filename."""

src/PIL/JpegImagePlugin.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ def APP(self, marker):
165165
except TypeError:
166166
dpi = x_resolution
167167
if math.isnan(dpi):
168-
raise ValueError
168+
msg = "DPI is not a number"
169+
raise ValueError(msg)
169170
if resolution_unit == 3: # cm
170171
# 1 dpcm = 2.54 dpi
171172
dpi *= 2.54
@@ -719,7 +720,8 @@ def validate_qtables(qtables):
719720
for idx, table in enumerate(qtables):
720721
try:
721722
if len(table) != 64:
722-
raise TypeError
723+
msg = "Invalid quantization table"
724+
raise TypeError(msg)
723725
table = array.array("H", table)
724726
except TypeError as e:
725727
msg = "Invalid quantization table"

src/PIL/PngImagePlugin.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,11 +438,12 @@ def chunk_IDAT(self, pos, length):
438438
tile = [("zip", (0, 0) + self.im_size, pos, self.im_rawmode)]
439439
self.im_tile = tile
440440
self.im_idat = length
441-
raise EOFError
441+
msg = "image data found"
442+
raise EOFError(msg)
442443

443444
def chunk_IEND(self, pos, length):
444-
# end of PNG image
445-
raise EOFError
445+
msg = "end of PNG image"
446+
raise EOFError(msg)
446447

447448
def chunk_PLTE(self, pos, length):
448449
# palette
@@ -891,7 +892,8 @@ def _seek(self, frame, rewind=False):
891892
self.dispose_extent = self.info.get("bbox")
892893

893894
if not self.tile:
894-
raise EOFError
895+
msg = "image not found in APNG frame"
896+
raise EOFError(msg)
895897

896898
# setup frame disposal (actual disposal done when needed in the next _seek())
897899
if self._prev_im is None and self.dispose_op == Disposal.OP_PREVIOUS:

0 commit comments

Comments
 (0)