Skip to content

Commit 871963b

Browse files
committed
Replaced tuple args with mode string where equivalent
1 parent 48c7eb2 commit 871963b

11 files changed

Lines changed: 13 additions & 25 deletions

src/PIL/BlpImagePlugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def _open(self) -> None:
273273
raise BLPFormatError(msg)
274274

275275
self._mode = "RGBA" if self._blp_alpha_depth else "RGB"
276-
self.tile = [ImageFile._Tile(decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))]
276+
self.tile = [ImageFile._Tile(decoder, (0, 0) + self.size, 0, self.mode)]
277277

278278

279279
class _BLPBaseDecoder(ImageFile.PyDecoder):

src/PIL/DdsImagePlugin.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,9 +560,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
560560
+ struct.pack("<4I", *rgba_mask) # dwRGBABitMask
561561
+ struct.pack("<5I", DDSCAPS.TEXTURE, 0, 0, 0, 0)
562562
)
563-
ImageFile._save(
564-
im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))]
565-
)
563+
ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, rawmode)])
566564

567565

568566
def _accept(prefix: bytes) -> bool:

src/PIL/FpxImagePlugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def _open_subimage(self, index: int = 1, subimage: int = 0) -> None:
170170
"raw",
171171
(x, y, x1, y1),
172172
i32(s, i) + 28,
173-
(self.rawmode,),
173+
self.rawmode,
174174
)
175175
)
176176

src/PIL/FtexImagePlugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def _open(self) -> None:
9595
self._mode = "RGBA"
9696
self.tile = [ImageFile._Tile("bcn", (0, 0) + self.size, 0, (1,))]
9797
elif format == Format.UNCOMPRESSED:
98-
self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 0, ("RGB", 0, 1))]
98+
self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 0, "RGB")]
9999
else:
100100
msg = f"Invalid texture compression format: {repr(format)}"
101101
raise ValueError(msg)

src/PIL/GdImageFile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def _open(self) -> None:
7676
"raw",
7777
(0, 0) + self.size,
7878
7 + true_color_offset + 4 + 256 * 4,
79-
("L", 0, 1),
79+
"L",
8080
)
8181
]
8282

src/PIL/ImtImagePlugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def _open(self) -> None:
6262
"raw",
6363
(0, 0) + self.size,
6464
self.fp.tell() - len(buffer),
65-
(self.mode, 0, 1),
65+
self.mode,
6666
)
6767
]
6868

src/PIL/MspImagePlugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def _open(self) -> None:
7070
self._size = i16(s, 4), i16(s, 6)
7171

7272
if s[:4] == b"DanM":
73-
self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 32, ("1", 0, 1))]
73+
self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 32, "1")]
7474
else:
7575
self.tile = [ImageFile._Tile("MSP", (0, 0) + self.size, 32)]
7676

@@ -188,7 +188,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
188188
fp.write(o16(h))
189189

190190
# image body
191-
ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 32, ("1", 0, 1))])
191+
ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 32, "1")])
192192

193193

194194
#

src/PIL/PixarImagePlugin.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ def _open(self) -> None:
6161
# FIXME: to be continued...
6262

6363
# create tile descriptor (assuming "dumped")
64-
self.tile = [
65-
ImageFile._Tile("raw", (0, 0) + self.size, 1024, (self.mode, 0, 1))
66-
]
64+
self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 1024, self.mode)]
6765

6866

6967
#

src/PIL/SpiderImagePlugin.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,7 @@ def _open(self) -> None:
154154
self.rawmode = "F;32F"
155155
self._mode = "F"
156156

157-
self.tile = [
158-
ImageFile._Tile("raw", (0, 0) + self.size, offset, (self.rawmode, 0, 1))
159-
]
157+
self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, offset, self.rawmode)]
160158
self._fp = self.fp # FIXME: hack
161159

162160
@property
@@ -280,9 +278,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:
280278
fp.writelines(hdr)
281279

282280
rawmode = "F;32NF" # 32-bit native floating point
283-
ImageFile._save(
284-
im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))]
285-
)
281+
ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, rawmode)])
286282

287283

288284
def _save_spider(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None:

src/PIL/XVThumbImagePlugin.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ def _open(self) -> None:
7474
self.palette = ImagePalette.raw("RGB", PALETTE)
7575

7676
self.tile = [
77-
ImageFile._Tile(
78-
"raw", (0, 0) + self.size, self.fp.tell(), (self.mode, 0, 1)
79-
)
77+
ImageFile._Tile("raw", (0, 0) + self.size, self.fp.tell(), self.mode)
8078
]
8179

8280

0 commit comments

Comments
 (0)