python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-10 19:56:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2023-02-06 19:27:15 +00:00
parent cb4eb0d40f
commit 24183d652e
111 changed files with 8 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/check_fli_overflow.py
View File

@ -4,7 +4,6 @@ TEST_FILE = "Tests/images/fli_overflow.fli"
def test_fli_overflow():
# this should not crash with a malloc error or access violation
with Image.open(TEST_FILE) as im:
im.load()

1
Tests/check_png_dos.py
View File

@ -23,7 +23,6 @@ def test_ignore_dos_text():
def test_dos_text():
try:
im = Image.open(TEST_FILE)
im.load()

1
Tests/test_bmp_reference.py
View File

@ -18,7 +18,6 @@ def test_bad():
"""These shouldn't crash/dos, but they shouldn't return anything
either"""
for f in get_files("b"):
# Assert that there is no unclosed file warning
with warnings.catch_warnings():
try:

1
Tests/test_file_bmp.py
View File

@ -141,7 +141,6 @@ def test_rgba_bitfields():
# This test image has been manually hexedited
# to change the bitfield compression in the header from XBGR to RGBA
with Image.open("Tests/images/rgb32bf-rgba.bmp") as im:
# So before the comparing the image, swap the channels
b, g, r = im.split()[1:]
im = Image.merge("RGB", (r, g, b))

2
Tests/test_file_bufrstub.py
View File

@ -10,7 +10,6 @@ TEST_FILE = "Tests/images/gfs.t06z.rassda.tm00.bufr_d"
def test_open():
# Act
with Image.open(TEST_FILE) as im:
# Assert
assert im.format == "BUFR"
@ -31,7 +30,6 @@ def test_invalid_file():
def test_load():
# Arrange
with Image.open(TEST_FILE) as im:
# Act / Assert: stub cannot load without an implemented handler
with pytest.raises(OSError):
im.load()

2
Tests/test_file_dcx.py
View File

@ -15,7 +15,6 @@ def test_sanity():
# Act
with Image.open(TEST_FILE) as im:
# Assert
assert im.size == (128, 128)
assert isinstance(im, DcxImagePlugin.DcxImageFile)
@ -54,7 +53,6 @@ def test_invalid_file():
def test_tell():
# Arrange
with Image.open(TEST_FILE) as im:
# Act
frame = im.tell()

1
Tests/test_file_eps.py
View File

@ -80,7 +80,6 @@ def test_invalid_file():
@pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
def test_cmyk():
with Image.open("Tests/images/pil_sample_cmyk.eps") as cmyk_image:
assert cmyk_image.mode == "CMYK"
assert cmyk_image.size == (100, 100)
assert cmyk_image.format == "EPS"

1
Tests/test_file_fits.py
View File

@ -12,7 +12,6 @@ TEST_FILE = "Tests/images/hopper.fits"
def test_open():
# Act
with Image.open(TEST_FILE) as im:
# Assert
assert im.format == "FITS"
assert im.size == (128, 128)

2
Tests/test_file_fli.py
View File

@ -64,7 +64,6 @@ def test_context_manager():
def test_tell():
# Arrange
with Image.open(static_test_file) as im:
# Act
frame = im.tell()
@ -110,7 +109,6 @@ def test_eoferror():
def test_seek_tell():
with Image.open(animated_test_file) as im:
layer_number = im.tell()
assert layer_number == 0

13
Tests/test_file_gif.py
View File

@ -209,7 +209,7 @@ def test_optimize_if_palette_can_be_reduced_by_half():
im = im.resize((591, 443))
im_rgb = im.convert("RGB")
for (optimize, colors) in ((False, 256), (True, 8)):
for optimize, colors in ((False, 256), (True, 8)):
out = BytesIO()
im_rgb.save(out, "GIF", optimize=optimize)
with Image.open(out) as reloaded:
@ -221,7 +221,6 @@ def test_roundtrip(tmp_path):
im = hopper()
im.save(out)
with Image.open(out) as reread:
assert_image_similar(reread.convert("RGB"), im, 50)
@ -232,7 +231,6 @@ def test_roundtrip2(tmp_path):
im2 = im.copy()
im2.save(out)
with Image.open(out) as reread:
assert_image_similar(reread.convert("RGB"), hopper(), 50)
@ -242,7 +240,6 @@ def test_roundtrip_save_all(tmp_path):
im = hopper()
im.save(out, save_all=True)
with Image.open(out) as reread:
assert_image_similar(reread.convert("RGB"), im, 50)
# Multiframe image
@ -284,13 +281,11 @@ def test_headers_saving_for_animated_gifs(tmp_path):
important_headers = ["background", "version", "duration", "loop"]
# Multiframe image
with Image.open("Tests/images/dispose_bgnd.gif") as im:
info = im.info.copy()
out = str(tmp_path / "temp.gif")
im.save(out, save_all=True)
with Image.open(out) as reread:
for header in important_headers:
assert info[header] == reread.info[header]
@ -308,7 +303,6 @@ def test_palette_handling(tmp_path):
im2.save(f, optimize=True)
with Image.open(f) as reloaded:
assert_image_similar(im, reloaded.convert("RGB"), 10)
@ -324,7 +318,6 @@ def test_palette_434(tmp_path):
orig = "Tests/images/test.colors.gif"
with Image.open(orig) as im:
with roundtrip(im) as reloaded:
assert_image_similar(im, reloaded, 1)
with roundtrip(im, optimize=True) as reloaded:
@ -575,7 +568,6 @@ def test_save_dispose(tmp_path):
)
with Image.open(out) as img:
for i in range(2):
img.seek(img.tell() + 1)
assert img.disposal_method == i + 1
@ -773,7 +765,6 @@ def test_multiple_duration(tmp_path):
out, save_all=True, append_images=im_list[1:], duration=duration_list
)
with Image.open(out) as reread:
for duration in duration_list:
assert reread.info["duration"] == duration
try:
@ -786,7 +777,6 @@ def test_multiple_duration(tmp_path):
out, save_all=True, append_images=im_list[1:], duration=tuple(duration_list)
)
with Image.open(out) as reread:
for duration in duration_list:
assert reread.info["duration"] == duration
try:
@ -844,7 +834,6 @@ def test_identical_frames(tmp_path):
out, save_all=True, append_images=im_list[1:], duration=duration_list
)
with Image.open(out) as reread:
# Assert that the first three frames were combined
assert reread.n_frames == 2

2
Tests/test_file_gribstub.py
View File

@ -10,7 +10,6 @@ TEST_FILE = "Tests/images/WAlaska.wind.7days.grb"
def test_open():
# Act
with Image.open(TEST_FILE) as im:
# Assert
assert im.format == "GRIB"
@ -31,7 +30,6 @@ def test_invalid_file():
def test_load():
# Arrange
with Image.open(TEST_FILE) as im:
# Act / Assert: stub cannot load without an implemented handler
with pytest.raises(OSError):
im.load()

2
Tests/test_file_hdf5stub.py
View File

@ -8,7 +8,6 @@ TEST_FILE = "Tests/images/hdf5.h5"
def test_open():
# Act
with Image.open(TEST_FILE) as im:
# Assert
assert im.format == "HDF5"
@ -29,7 +28,6 @@ def test_invalid_file():
def test_load():
# Arrange
with Image.open(TEST_FILE) as im:
# Act / Assert: stub cannot load without an implemented handler
with pytest.raises(OSError):
im.load()

1
Tests/test_file_icns.py
View File

@ -16,7 +16,6 @@ def test_sanity():
# Loading this icon by default should result in the largest size
# (512x512@2x) being loaded
with Image.open(TEST_FILE) as im:
# Assert that there is no unclosed file warning
with warnings.catch_warnings():
im.load()

1
Tests/test_file_ico.py
View File

@ -175,7 +175,6 @@ def test_save_256x256(tmp_path):
# Act
im.save(outfile)
with Image.open(outfile) as im_saved:
# Assert
assert im_saved.size == (256, 256)

1
Tests/test_file_im.py
View File

@ -51,7 +51,6 @@ def test_context_manager():
def test_tell():
# Arrange
with Image.open(TEST_IM) as im:
# Act
frame = im.tell()

3
Tests/test_file_iptc.py
View File

@ -11,7 +11,6 @@ TEST_FILE = "Tests/images/iptc.jpg"
def test_getiptcinfo_jpg_none():
# Arrange
with hopper() as im:
# Act
iptc = IptcImagePlugin.getiptcinfo(im)
@ -22,7 +21,6 @@ def test_getiptcinfo_jpg_none():
def test_getiptcinfo_jpg_found():
# Arrange
with Image.open(TEST_FILE) as im:
# Act
iptc = IptcImagePlugin.getiptcinfo(im)
@ -35,7 +33,6 @@ def test_getiptcinfo_jpg_found():
def test_getiptcinfo_tiff_none():
# Arrange
with Image.open("Tests/images/hopper.tif") as im:
# Act
iptc = IptcImagePlugin.getiptcinfo(im)

13
Tests/test_file_jpeg.py
View File

@ -57,7 +57,6 @@ class TestFileJpeg:
return Image.frombytes(mode, size, os.urandom(size[0] * size[1] * len(mode)))
def test_sanity(self):
# internal version number
assert re.search(r"\d+\.\d+$", features.version_codec("jpg"))
@ -368,7 +367,6 @@ class TestFileJpeg:
def test_exif_gps_typeerror(self):
with Image.open("Tests/images/exif_gps_typeerror.jpg") as im:
# Should not raise a TypeError
im._getexif()
@ -682,7 +680,6 @@ class TestFileJpeg:
# Shouldn't raise error
fn = "Tests/images/sugarshack_bad_mpo_header.jpg"
with pytest.warns(UserWarning, Image.open, fn) as im:
# Assert
assert im.format == "JPEG"
@ -704,7 +701,6 @@ class TestFileJpeg:
# Arrange
outfile = str(tmp_path / "temp.tif")
with Image.open("Tests/images/hopper.tif") as im:
# Act
im.save(outfile, "JPEG", dpi=im.info["dpi"])
@ -731,7 +727,6 @@ class TestFileJpeg:
# This Photoshop CC 2017 image has DPI in EXIF not metadata
# EXIF XResolution is (2000000, 10000)
with Image.open("Tests/images/photoshop-200dpi.jpg") as im:
# Act / Assert
assert im.info.get("dpi") == (200, 200)
@ -740,7 +735,6 @@ class TestFileJpeg:
# This image has DPI in EXIF not metadata
# EXIF XResolution is 72
with Image.open("Tests/images/exif-72dpi-int.jpg") as im:
# Act / Assert
assert im.info.get("dpi") == (72, 72)
@ -749,7 +743,6 @@ class TestFileJpeg:
# This is photoshop-200dpi.jpg with EXIF resolution unit set to cm:
# exiftool -exif:ResolutionUnit=cm photoshop-200dpi.jpg
with Image.open("Tests/images/exif-200dpcm.jpg") as im:
# Act / Assert
assert im.info.get("dpi") == (508, 508)
@ -758,7 +751,6 @@ class TestFileJpeg:
# This is photoshop-200dpi.jpg with EXIF resolution set to 0/0:
# exiftool -XResolution=0/0 -YResolution=0/0 photoshop-200dpi.jpg
with Image.open("Tests/images/exif-dpi-zerodivision.jpg") as im:
# Act / Assert
# This should return the default, and not raise a ZeroDivisionError
assert im.info.get("dpi") == (72, 72)
@ -767,7 +759,6 @@ class TestFileJpeg:
# Arrange
# 0x011A tag in this exif contains string '300300\x02'
with Image.open("Tests/images/broken_exif_dpi.jpg") as im:
# Act / Assert
# This should return the default
assert im.info.get("dpi") == (72, 72)
@ -777,7 +768,6 @@ class TestFileJpeg:
# This is photoshop-200dpi.jpg with resolution removed from EXIF:
# exiftool "-*resolution*"= photoshop-200dpi.jpg
with Image.open("Tests/images/no-dpi-in-exif.jpg") as im:
# Act / Assert
# "When the image resolution is unknown, 72 [dpi] is designated."
# https://exiv2.org/tags.html
@ -787,7 +777,6 @@ class TestFileJpeg:
# This is no-dpi-in-exif with the tiff header of the exif block
# hexedited from MM * to FF FF FF FF
with Image.open("Tests/images/invalid-exif.jpg") as im:
# This should return the default, and not a SyntaxError or
# OSError for unidentified image.
assert im.info.get("dpi") == (72, 72)
@ -810,7 +799,6 @@ class TestFileJpeg:
def test_invalid_exif_x_resolution(self):
# When no x or y resolution is defined in EXIF
with Image.open("Tests/images/invalid-exif-without-x-resolution.jpg") as im:
# This should return the default, and not a ValueError or
# OSError for an unidentified image.
assert im.info.get("dpi") == (72, 72)
@ -820,7 +808,6 @@ class TestFileJpeg:
# This image has been manually hexedited to have an IFD offset of 10,
# in contrast to normal 8
with Image.open("Tests/images/exif-ifd-offset.jpg") as im:
# Act / Assert
assert im._getexif()[306] == "2017:03:13 23:03:09"

1
Tests/test_file_jpeg2k.py
View File

@ -270,7 +270,6 @@ def test_rgba():
# Arrange
with Image.open("Tests/images/rgb_trns_ycbc.j2k") as j2k:
with Image.open("Tests/images/rgb_trns_ycbc.jp2") as jp2:
# Act
j2k.load()
jp2.load()

2
Tests/test_file_libtiff.py
View File

@ -645,7 +645,6 @@ class TestFileLibTiff(LibTiffTestCase):
pilim = hopper()
def save_bytesio(compression=None):
buffer_io = io.BytesIO()
pilim.save(buffer_io, format="tiff", compression=compression)
buffer_io.seek(0)
@ -740,7 +739,6 @@ class TestFileLibTiff(LibTiffTestCase):
def test_multipage_compression(self):
with Image.open("Tests/images/compression.tif") as im:
im.seek(0)
assert im._compression == "tiff_ccitt"
assert im.size == (10, 10)

2
Tests/test_file_msp.py
View File

@ -44,7 +44,6 @@ def test_open_windows_v1():
# Arrange
# Act
with Image.open(TEST_FILE) as im:
# Assert
assert_image_equal(im, hopper("1"))
assert isinstance(im, MspImagePlugin.MspImageFile)
@ -59,7 +58,6 @@ def _assert_file_image_equal(source_path, target_path):
not os.path.exists(EXTRA_DIR), reason="Extra image files not installed"
)
def test_open_windows_v2():
files = (
os.path.join(EXTRA_DIR, f)
for f in os.listdir(EXTRA_DIR)

2
Tests/test_file_pdf.py
View File

@ -89,7 +89,6 @@ def test_save_all(tmp_path):
# Multiframe image
with Image.open("Tests/images/dispose_bgnd.gif") as im:
outfile = str(tmp_path / "temp.pdf")
im.save(outfile, save_all=True)
@ -123,7 +122,6 @@ def test_save_all(tmp_path):
def test_multiframe_normal_save(tmp_path):
# Test saving a multiframe image without save_all
with Image.open("Tests/images/dispose_bgnd.gif") as im:
outfile = str(tmp_path / "temp.pdf")
im.save(outfile)

4
Tests/test_file_png.py
View File

@ -78,7 +78,6 @@ class TestFilePng:
return chunks
def test_sanity(self, tmp_path):
# internal version number
assert re.search(r"\d+\.\d+\.\d+(\.\d+)?$", features.version_codec("zlib"))
@ -156,7 +155,6 @@ class TestFilePng:
assert im.info == {"spam": "egg"}
def test_bad_itxt(self):
im = load(HEAD + chunk(b"iTXt") + TAIL)
assert im.info == {}
@ -201,7 +199,6 @@ class TestFilePng:
assert im.info["spam"].tkey == "Spam"
def test_interlace(self):
test_file = "Tests/images/pil123p.png"
with Image.open(test_file) as im:
assert_image(im, "P", (162, 150))
@ -495,7 +492,6 @@ class TestFilePng:
# Check reading images with null tRNS value, issue #1239
test_file = "Tests/images/tRNS_null_1x1.png"
with Image.open(test_file) as im:
assert im.info["transparency"] == 0
def test_save_icc_profile(self):

2
Tests/test_file_psd.py
View File

@ -77,7 +77,6 @@ def test_eoferror():
def test_seek_tell():
with Image.open(test_file) as im:
layer_number = im.tell()
assert layer_number == 1
@ -95,7 +94,6 @@ def test_seek_tell():
def test_seek_eoferror():
with Image.open(test_file) as im:
with pytest.raises(EOFError):
im.seek(-1)

1
Tests/test_file_spider.py
View File

@ -79,7 +79,6 @@ def test_is_spider_image():
def test_tell():
# Arrange
with Image.open(TEST_FILE) as im:
# Act
index = im.tell()

1
Tests/test_file_sun.py
View File

@ -16,7 +16,6 @@ def test_sanity():
# Act
with Image.open(test_file) as im:
# Assert
assert im.size == (128, 128)

3
Tests/test_file_tga.py
View File

@ -78,7 +78,6 @@ def test_id_field():
# Act
with Image.open(test_file) as im:
# Assert
assert im.size == (100, 100)
@ -89,7 +88,6 @@ def test_id_field_rle():
# Act
with Image.open(test_file) as im:
# Assert
assert im.size == (199, 199)
@ -171,7 +169,6 @@ def test_save_id_section(tmp_path):
test_file = "Tests/images/tga_id_field.tga"
with Image.open(test_file) as im:
# Save with no id section
im.save(out, id_section="")
with Image.open(out) as test_im:

7
Tests/test_file_tiff.py
View File

@ -25,7 +25,6 @@ except ImportError:
class TestFileTiff:
def test_sanity(self, tmp_path):
filename = str(tmp_path / "temp.tif")
hopper("RGB").save(filename)
@ -157,7 +156,6 @@ class TestFileTiff:
def test_xyres_tiff(self):
filename = "Tests/images/pil168.tif"
with Image.open(filename) as im:
# legacy api
assert isinstance(im.tag[X_RESOLUTION][0], tuple)
assert isinstance(im.tag[Y_RESOLUTION][0], tuple)
@ -171,7 +169,6 @@ class TestFileTiff:
def test_xyres_fallback_tiff(self):
filename = "Tests/images/compression.tif"
with Image.open(filename) as im:
# v2 api
assert isinstance(im.tag_v2[X_RESOLUTION], TiffImagePlugin.IFDRational)
assert isinstance(im.tag_v2[Y_RESOLUTION], TiffImagePlugin.IFDRational)
@ -186,7 +183,6 @@ class TestFileTiff:
def test_int_resolution(self):
filename = "Tests/images/pil168.tif"
with Image.open(filename) as im:
# Try to read a file where X,Y_RESOLUTION are ints
im.tag_v2[X_RESOLUTION] = 71
im.tag_v2[Y_RESOLUTION] = 71
@ -381,7 +377,6 @@ class TestFileTiff:
def test___str__(self):
filename = "Tests/images/pil136.tiff"
with Image.open(filename) as im:
# Act
ret = str(im.ifd)
@ -392,7 +387,6 @@ class TestFileTiff:
# Arrange
filename = "Tests/images/pil136.tiff"
with Image.open(filename) as im:
# v2 interface
v2_tags = {
256: 55,
@ -630,7 +624,6 @@ class TestFileTiff:
filename = str(tmp_path / "temp.tif")
hopper("RGB").save(filename, **kwargs)
with Image.open(filename) as im:
# legacy interface
assert im.tag[X_RESOLUTION][0][0] == 72
assert im.tag[Y_RESOLUTION][0][0] == 36

3
Tests/test_file_tiff_metadata.py
View File

@ -54,7 +54,6 @@ def test_rt_metadata(tmp_path):
img.save(f, tiffinfo=info)
with Image.open(f) as loaded:
assert loaded.tag[ImageJMetaDataByteCounts] == (len(bin_data),)
assert loaded.tag_v2[ImageJMetaDataByteCounts] == (len(bin_data),)
@ -74,14 +73,12 @@ def test_rt_metadata(tmp_path):
info[ImageJMetaDataByteCounts] = (8, len(bin_data) - 8)
img.save(f, tiffinfo=info)
with Image.open(f) as loaded:
assert loaded.tag[ImageJMetaDataByteCounts] == (8, len(bin_data) - 8)
assert loaded.tag_v2[ImageJMetaDataByteCounts] == (8, len(bin_data) - 8)
def test_read_metadata():
with Image.open("Tests/images/hopper_g4.tif") as img:
assert {
"YResolution": IFDRational(4294967295, 113653537),
"PlanarConfiguration": 1,

4
Tests/test_file_webp_metadata.py
View File

@ -18,10 +18,8 @@ except ImportError:
def test_read_exif_metadata():
file_path = "Tests/images/flower.webp"
with Image.open(file_path) as image:
assert image.format == "WEBP"
exif_data = image.info.get("exif", None)
assert exif_data
@ -64,10 +62,8 @@ def test_write_exif_metadata():
def test_read_icc_profile():
file_path = "Tests/images/flower2.webp"
with Image.open(file_path) as image:
assert image.format == "WEBP"
assert image.info.get("icc_profile", None)

1
Tests/test_file_wmf.py
View File

@ -6,7 +6,6 @@ from .helper import assert_image_similar_tofile, hopper
def test_load_raw():
# Test basic EMF open and rendering
with Image.open("Tests/images/drawing.emf") as im:
if hasattr(Image.core, "drawwmf"):

2
Tests/test_file_xbm.py
View File

@ -44,7 +44,6 @@ def test_open():
# Act
with Image.open(filename) as im:
# Assert
assert im.mode == "1"
assert im.size == (128, 128)
@ -57,7 +56,6 @@ def test_open_filename_with_underscore():
# Act
with Image.open(filename) as im:
# Assert
assert im.mode == "1"
assert im.size == (128, 128)

1
Tests/test_file_xvthumb.py
View File

@ -10,7 +10,6 @@ TEST_FILE = "Tests/images/hopper.p7"
def test_open():
# Act
with Image.open(TEST_FILE) as im:
# Assert
assert im.format == "XVThumb"

2
Tests/test_image.py
View File

@ -69,7 +69,6 @@ class TestImage:
assert issubclass(UnidentifiedImageError, OSError)
def test_sanity(self):
im = Image.new("L", (100, 100))
assert repr(im)[:45] == "<PIL.Image.Image image mode=L size=100x100 at"
assert im.mode == "L"
@ -1007,7 +1006,6 @@ def mock_encode(*args):
class TestRegistry:
def test_encode_registry(self):
Image.register_encoder("MOCK", mock_encode)
assert "MOCK" in Image.ENCODERS

1
Tests/test_image_convert.py
View File

@ -45,7 +45,6 @@ def test_unsupported_conversion():
def test_default():
im = hopper("P")
assert im.mode == "P"
converted_im = im.convert()

1
Tests/test_image_crop.py
View File

@ -86,7 +86,6 @@ def test_crop_crash():
def test_crop_zero():
im = Image.new("RGB", (0, 0), "white")
cropped = im.crop((0, 0, 0, 0))

1
Tests/test_image_getbbox.py
View File

@ -4,7 +4,6 @@ from .helper import hopper
def test_sanity():
bbox = hopper().getbbox()
assert isinstance(bbox, tuple)

1
Tests/test_image_mode.py
View File

@ -6,7 +6,6 @@ from .helper import hopper
def test_sanity():
with hopper() as im:
im.mode

2
Tests/test_image_rotate.py
View File

@ -52,7 +52,7 @@ def test_resample():
# >>> im.save('Tests/images/hopper_45.png')
with Image.open("Tests/images/hopper_45.png") as target:
for (resample, epsilon) in (
for resample, epsilon in (
(Image.Resampling.NEAREST, 10),
(Image.Resampling.BILINEAR, 5),
(Image.Resampling.BICUBIC, 0),

1
Tests/test_image_tobitmap.py
View File

@ -4,7 +4,6 @@ from .helper import assert_image_equal, fromstring, hopper
def test_sanity():
with pytest.raises(ValueError):
hopper().tobitmap()

21
Tests/test_imagechops.py
View File

@ -50,7 +50,6 @@ def test_add():
# Arrange
with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
# Act
new = ImageChops.add(im1, im2)
@ -63,7 +62,6 @@ def test_add_scale_offset():
# Arrange
with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
# Act
new = ImageChops.add(im1, im2, scale=2.5, offset=100)
@ -87,7 +85,6 @@ def test_add_modulo():
# Arrange
with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
# Act
new = ImageChops.add_modulo(im1, im2)
@ -111,7 +108,6 @@ def test_blend():
# Arrange
with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
# Act
new = ImageChops.blend(im1, im2, 0.5)
@ -137,7 +133,6 @@ def test_darker_image():
# Arrange
with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
# Act
new = ImageChops.darker(im1, im2)
@ -149,7 +144,6 @@ def test_darker_pixel():
# Arrange
im1 = hopper()
with Image.open("Tests/images/imagedraw_chord_RGB.png") as im2:
# Act
new = ImageChops.darker(im1, im2)
@ -161,7 +155,6 @@ def test_difference():
# Arrange
with Image.open("Tests/images/imagedraw_arc_end_le_start.png") as im1:
with Image.open("Tests/images/imagedraw_arc_no_loops.png") as im2:
# Act
new = ImageChops.difference(im1, im2)
@ -173,7 +166,6 @@ def test_difference_pixel():
# Arrange
im1 = hopper()
with Image.open("Tests/images/imagedraw_polygon_kite_RGB.png") as im2:
# Act
new = ImageChops.difference(im1, im2)
@ -195,7 +187,6 @@ def test_duplicate():
def test_invert():
# Arrange
with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im:
# Act
new = ImageChops.invert(im)
@ -209,7 +200,6 @@ def test_lighter_image():
# Arrange
with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
# Act
new = ImageChops.lighter(im1, im2)
@ -221,7 +211,6 @@ def test_lighter_pixel():
# Arrange
im1 = hopper()
with Image.open("Tests/images/imagedraw_chord_RGB.png") as im2:
# Act
new = ImageChops.lighter(im1, im2)
@ -275,7 +264,6 @@ def test_offset():
xoffset = 45
yoffset = 20
with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im:
# Act
new = ImageChops.offset(im, xoffset, yoffset)
@ -292,7 +280,6 @@ def test_screen():
# Arrange
with Image.open("Tests/images/imagedraw_ellipse_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_floodfill_RGB.png") as im2:
# Act
new = ImageChops.screen(im1, im2)
@ -305,7 +292,6 @@ def test_subtract():
# Arrange
with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
# Act
new = ImageChops.subtract(im1, im2)
@ -319,7 +305,6 @@ def test_subtract_scale_offset():
# Arrange
with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
# Act
new = ImageChops.subtract(im1, im2, scale=2.5, offset=100)
@ -332,7 +317,6 @@ def test_subtract_clip():
# Arrange
im1 = hopper()
with Image.open("Tests/images/imagedraw_chord_RGB.png") as im2:
# Act
new = ImageChops.subtract(im1, im2)
@ -344,7 +328,6 @@ def test_subtract_modulo():
# Arrange
with Image.open("Tests/images/imagedraw_chord_RGB.png") as im1:
with Image.open("Tests/images/imagedraw_outline_chord_RGB.png") as im2:
# Act
new = ImageChops.subtract_modulo(im1, im2)
@ -358,7 +341,6 @@ def test_subtract_modulo_no_clip():
# Arrange
im1 = hopper()
with Image.open("Tests/images/imagedraw_chord_RGB.png") as im2:
# Act
new = ImageChops.subtract_modulo(im1, im2)
@ -370,7 +352,6 @@ def test_soft_light():
# Arrange
with Image.open("Tests/images/hopper.png") as im1:
with Image.open("Tests/images/hopper-XYZ.png") as im2:
# Act
new = ImageChops.soft_light(im1, im2)
@ -383,7 +364,6 @@ def test_hard_light():
# Arrange
with Image.open("Tests/images/hopper.png") as im1:
with Image.open("Tests/images/hopper-XYZ.png") as im2:
# Act
new = ImageChops.hard_light(im1, im2)
@ -396,7 +376,6 @@ def test_overlay():
# Arrange
with Image.open("Tests/images/hopper.png") as im1:
with Image.open("Tests/images/hopper-XYZ.png") as im2:
# Act
new = ImageChops.overlay(im1, im2)

1
Tests/test_imagedraw.py
View File

@ -52,7 +52,6 @@ def test_sanity():
def test_valueerror():
with Image.open("Tests/images/chi.gif") as im:
draw = ImageDraw.Draw(im)
draw.line((0, 0), fill=(0, 0, 0))

1
Tests/test_imagefile.py
View File

@ -30,7 +30,6 @@ SAFEBLOCK = ImageFile.SAFEBLOCK
class TestImageFile:
def test_parser(self):
def roundtrip(format):
im = hopper("L").resize((1000, 1000), Image.Resampling.NEAREST)
if format in ("MSP", "XBM"):
im = im.convert("1")

3
Tests/test_imageops.py
View File

@ -21,7 +21,6 @@ deformer = Deformer()
def test_sanity():
ImageOps.autocontrast(hopper("L"))
ImageOps.autocontrast(hopper("RGB"))
@ -419,7 +418,6 @@ def test_autocontrast_cutoff():
def test_autocontrast_mask_toy_input():
# Test the mask argument of autocontrast
with Image.open("Tests/images/bw_gradient.png") as img:
rect_mask = Image.new("L", img.size, 0)
draw = ImageDraw.Draw(rect_mask)
x0 = img.size[0] // 4
@ -439,7 +437,6 @@ def test_autocontrast_mask_toy_input():
def test_autocontrast_mask_real_input():
# Test the autocontrast with a rectangular mask
with Image.open("Tests/images/iptc.jpg") as img:
rect_mask = Image.new("L", img.size, 0)
draw = ImageDraw.Draw(rect_mask)
x0, y0 = img.size[0] // 2, img.size[1] // 2

3
Tests/test_imagepalette.py
View File

@ -6,7 +6,6 @@ from .helper import assert_image_equal, assert_image_equal_tofile
def test_sanity():
palette = ImagePalette.ImagePalette("RGB", list(range(256)) * 3)
assert len(palette.colors) == 256
@ -23,7 +22,6 @@ def test_reload():
def test_getcolor():
palette = ImagePalette.ImagePalette()
assert len(palette.palette) == 0
assert len(palette.colors) == 0
@ -84,7 +82,6 @@ def test_getcolor_not_special(index, palette):
def test_file(tmp_path):
palette = ImagePalette.ImagePalette("RGB", list(range(256)) * 3)
f = str(tmp_path / "temp.lut")

1
Tests/test_imagepath.py
View File

@ -8,7 +8,6 @@ from PIL import Image, ImagePath
def test_path():
p = ImagePath.Path(list(range(10)))
# sequence interface

1
Tests/test_imagesequence.py
View File

@ -6,7 +6,6 @@ from .helper import assert_image_equal, hopper, skip_unless_feature
def test_sanity(tmp_path):
test_file = str(tmp_path / "temp.im")
im = hopper("RGB")

3
Tests/test_imagestat.py
View File

@ -6,7 +6,6 @@ from .helper import hopper
def test_sanity():
im = hopper()
st = ImageStat.Stat(im)
@ -31,7 +30,6 @@ def test_sanity():
def test_hopper():
im = hopper()
st = ImageStat.Stat(im)
@ -45,7 +43,6 @@ def test_hopper():
def test_constant():
im = Image.new("L", (128, 128), 128)
st = ImageStat.Stat(im)

1
Tests/test_lib_image.py
View File

@ -4,7 +4,6 @@ from PIL import Image
def test_setmode():
im = Image.new("L", (1, 1), 255)
im.im.setmode("1")
assert im.im.getpixel((0, 0)) == 255

2
Tests/test_mode_i16.py
View File

@ -42,7 +42,6 @@ def test_basic(tmp_path, mode):
im_in.save(filename)
with Image.open(filename) as im_out:
verify(im_in)
verify(im_out)
@ -87,7 +86,6 @@ def test_tobytes():
def test_convert():
im = original.copy()
verify(im.convert("I;16"))

1
Tests/test_numpy.py
View File

@ -235,7 +235,6 @@ def test_no_resource_warning_for_numpy_array():
test_file = "Tests/images/hopper.png"
with Image.open(test_file) as im:
# Act/Assert
with warnings.catch_warnings():
array(im)

1
Tests/test_pickle.py
View File

@ -89,7 +89,6 @@ def test_pickle_la_mode_with_palette(tmp_path):
def test_pickle_tell():
# Arrange
with Image.open("Tests/images/hopper.webp") as image:
# Act: roundtrip
unpickled_image = pickle.loads(pickle.dumps(image))

2
Tests/test_tiff_ifdrational.py
View File

@ -7,7 +7,6 @@ from .helper import hopper
def _test_equal(num, denom, target):
t = IFDRational(num, denom)
assert target == t
@ -15,7 +14,6 @@ def _test_equal(num, denom, target):
def test_sanity():
_test_equal(1, 1, 1)
_test_equal(1, 1, Fraction(1, 1))

1
Tests/test_webp_leaks.py
View File

@ -9,7 +9,6 @@ test_file = "Tests/images/hopper.webp"
@skip_unless_feature("webp")
class TestWebPLeaks(PillowLeakTestCase):
mem_limit = 3 * 1024 # kb
iterations = 100

2
setup.py
View File

@ -430,7 +430,6 @@ class pil_build_ext(build_ext):
return sdk_path
def build_extensions(self):
library_dirs = []
include_dirs = []
@ -917,7 +916,6 @@ class pil_build_ext(build_ext):
self.summary_report(feature)
def summary_report(self, feature):
print("-" * 68)
print("PIL SETUP SUMMARY")
print("-" * 68)

2
src/PIL/BmpImagePlugin.py
View File

@ -223,7 +223,6 @@ class BmpImageFile(ImageFile.ImageFile):
# --------------- Once the header is processed, process the palette/LUT
if self.mode == "P": # Paletted for 1, 4 and 8 bit images
# ---------------------------------------------------- 1-bit images
if not (0 < file_info["colors"] <= 65536):
msg = f"Unsupported BMP Palette size ({file_info['colors']})"
@ -360,7 +359,6 @@ class BmpRleDecoder(ImageFile.PyDecoder):
# Image plugin for the DIB format (BMP alias)
# =============================================================================
class DibImageFile(BmpImageFile):
format = "DIB"
format_description = "Windows Bitmap"

2
src/PIL/BufrStubImagePlugin.py
View File

@ -33,12 +33,10 @@ def _accept(prefix):
class BufrStubImageFile(ImageFile.StubImageFile):
format = "BUFR"
format_description = "BUFR"
def _open(self):
offset = self.fp.tell()
if not _accept(self.fp.read(4)):

2
src/PIL/CurImagePlugin.py
View File

@ -32,12 +32,10 @@ def _accept(prefix):
class CurImageFile(BmpImagePlugin.BmpImageFile):
format = "CUR"
format_description = "Windows Cursor"
def _open(self):
offset = self.fp.tell()
# check magic

2
src/PIL/DcxImagePlugin.py
View File

@ -37,13 +37,11 @@ def _accept(prefix):
class DcxImageFile(PcxImageFile):
format = "DCX"
format_description = "Intel DCX"
_close_exclusive_fp_after_loading = False
def _open(self):
# Header
s = self.fp.read(4)
if not _accept(s):

2
src/PIL/EpsImagePlugin.py
View File

@ -286,7 +286,6 @@ class EpsImageFile(ImageFile.ImageFile):
# Scan for an "ImageData" descriptor
while s[:1] == "%":
if len(s) > 255:
msg = "not an EPS file"
raise SyntaxError(msg)
@ -317,7 +316,6 @@ class EpsImageFile(ImageFile.ImageFile):
raise OSError(msg)
def _find_offset(self, fp):
s = fp.read(4)
if s == b"%!PS":

1
src/PIL/FitsImagePlugin.py
View File

@ -19,7 +19,6 @@ def _accept(prefix):
class FitsImageFile(ImageFile.ImageFile):
format = "FITS"
format_description = "FITS"

1
src/PIL/FitsStubImagePlugin.py
View File

@ -44,7 +44,6 @@ def register_handler(handler):
class FITSStubImageFile(ImageFile.StubImageFile):
format = FitsImagePlugin.FitsImageFile.format
format_description = FitsImagePlugin.FitsImageFile.format_description

2
src/PIL/FliImagePlugin.py
View File

@ -40,13 +40,11 @@ def _accept(prefix):
class FliImageFile(ImageFile.ImageFile):
format = "FLI"
format_description = "Autodesk FLI/FLC Animation"
_close_exclusive_fp_after_loading = False
def _open(self):
# HEAD
s = self.fp.read(128)
if not (_accept(s) and s[20:22] == b"\x00\x00"):

1
src/PIL/FontFile.py
View File

@ -36,7 +36,6 @@ class FontFile:
bitmap = None
def __init__(self):
self.info = {}
self.glyph = [None] * 256

5
src/PIL/FpxImagePlugin.py
View File

@ -48,7 +48,6 @@ def _accept(prefix):
class FpxImageFile(ImageFile.ImageFile):
format = "FPX"
format_description = "FlashPix"
@ -157,7 +156,6 @@ class FpxImageFile(ImageFile.ImageFile):
self.tile = []
for i in range(0, len(s), length):
x1 = min(xsize, x + xtile)
y1 = min(ysize, y + ytile)
@ -174,7 +172,6 @@ class FpxImageFile(ImageFile.ImageFile):
)
elif compression == 1:
# FIXME: the fill decoder is not implemented
self.tile.append(
(
@ -186,7 +183,6 @@ class FpxImageFile(ImageFile.ImageFile):
)
elif compression == 2:
internal_color_conversion = s[14]
jpeg_tables = s[15]
rawmode = self.rawmode
@ -234,7 +230,6 @@ class FpxImageFile(ImageFile.ImageFile):
self.fp = None
def load(self):
if not self.fp:
self.fp = self.ole.openstream(self.stream[:2] + ["Subimage 0000 Data"])

1
src/PIL/GbrImagePlugin.py
View File

@ -37,7 +37,6 @@ def _accept(prefix):
class GbrImageFile(ImageFile.ImageFile):
format = "GBR"
format_description = "GIMP brush file"

1
src/PIL/GdImageFile.py
View File

@ -44,7 +44,6 @@ class GdImageFile(ImageFile.ImageFile):
format_description = "GD uncompressed images"
def _open(self):
# Header
s = self.fp.read(1037)

6
src/PIL/GifImagePlugin.py
View File

@ -61,7 +61,6 @@ def _accept(prefix):
class GifImageFile(ImageFile.ImageFile):
format = "GIF"
format_description = "Compuserve GIF"
_close_exclusive_fp_after_loading = False
@ -81,7 +80,6 @@ class GifImageFile(ImageFile.ImageFile):
return False
def _open(self):
# Screen
s = self.fp.read(13)
if not _accept(s):
@ -157,7 +155,6 @@ class GifImageFile(ImageFile.ImageFile):
raise EOFError(msg) from e
def _seek(self, frame, update_image=True):
if frame == 0:
# rewind
self.__offset = 0
@ -195,7 +192,6 @@ class GifImageFile(ImageFile.ImageFile):
interlace = None
frame_dispose_extent = None
while True:
if not s:
s = self.fp.read(1)
if not s or s == b";":
@ -579,7 +575,6 @@ def _getbbox(base_im, im_frame):
def _write_multiple_frames(im, fp, palette):
duration = im.encoderinfo.get("duration")
disposal = im.encoderinfo.get("disposal", im.info.get("disposal"))
@ -752,7 +747,6 @@ def _write_local_header(fp, im, offset, flags):
def _save_netpbm(im, fp, filename):
# Unused by default.
# To use, uncomment the register_save call at the end of the file.
#

5
src/PIL/GimpGradientFile.py
View File

@ -64,18 +64,15 @@ SEGMENTS = [linear, curved, sine, sphere_increasing, sphere_decreasing]
class GradientFile:
gradient = None
def getpalette(self, entries=256):
palette = []
ix = 0
x0, x1, xm, rgb0, rgb1, segment = self.gradient[ix]
for i in range(entries):
x = i / (entries - 1)
while x1 < x:
@ -105,7 +102,6 @@ class GimpGradientFile(GradientFile):
"""File handler for GIMP's gradient format."""
def __init__(self, fp):
if fp.readline()[:13] != b"GIMP Gradient":
msg = "not a GIMP gradient file"
raise SyntaxError(msg)
@ -121,7 +117,6 @@ class GimpGradientFile(GradientFile):
gradient = []
for i in range(count):
s = fp.readline().split()
w = [float(x) for x in s[:11]]

3
src/PIL/GimpPaletteFile.py
View File

@ -25,7 +25,6 @@ class GimpPaletteFile:
rawmode = "RGB"
def __init__(self, fp):
self.palette = [o8(i) * 3 for i in range(256)]
if fp.readline()[:12] != b"GIMP Palette":
@ -33,7 +32,6 @@ class GimpPaletteFile:
raise SyntaxError(msg)
for i in range(256):
s = fp.readline()
if not s:
break
@ -55,5 +53,4 @@ class GimpPaletteFile:
self.palette = b"".join(self.palette)
def getpalette(self):
return self.palette, self.rawmode

2
src/PIL/GribStubImagePlugin.py
View File

@ -33,12 +33,10 @@ def _accept(prefix):
class GribStubImageFile(ImageFile.StubImageFile):
format = "GRIB"
format_description = "GRIB"
def _open(self):
offset = self.fp.tell()
if not _accept(self.fp.read(8)):

2
src/PIL/Hdf5StubImagePlugin.py
View File

@ -33,12 +33,10 @@ def _accept(prefix):
class HDF5StubImageFile(ImageFile.StubImageFile):
format = "HDF5"
format_description = "HDF5"
def _open(self):
offset = self.fp.tell()
if not _accept(self.fp.read(8)):

3
src/PIL/IcnsImagePlugin.py
View File

@ -135,7 +135,6 @@ def read_png_or_jpeg2000(fobj, start_length, size):
class IcnsFile:
SIZES = {
(512, 512, 2): [(b"ic10", read_png_or_jpeg2000)],
(512, 512, 1): [(b"ic09", read_png_or_jpeg2000)],
@ -189,7 +188,7 @@ class IcnsFile:
def itersizes(self):
sizes = []
for size, fmts in self.SIZES.items():
for (fmt, reader) in fmts:
for fmt, reader in fmts:
if fmt in self.dct:
sizes.append(size)
break

2
src/PIL/IcoImagePlugin.py
View File

@ -185,7 +185,7 @@ class IcoFile:
return {(h["width"], h["height"]) for h in self.entry}
def getentryindex(self, size, bpp=False):
for (i, h) in enumerate(self.entry):
for i, h in enumerate(self.entry):
if size == h["dim"] and (bpp is False or bpp == h["color_depth"]):
return i
return 0

7
src/PIL/ImImagePlugin.py
View File

@ -115,13 +115,11 @@ def number(s):
class ImImageFile(ImageFile.ImageFile):
format = "IM"
format_description = "IFUNC Image Memory"
_close_exclusive_fp_after_loading = False
def _open(self):
# Quick rejection: if there's not an LF among the first
# 100 bytes, this is (probably) not a text header.
@ -140,7 +138,6 @@ class ImImageFile(ImageFile.ImageFile):
self.rawmode = "L"
while True:
s = self.fp.read(1)
# Some versions of IFUNC uses \n\r instead of \r\n...
@ -169,7 +166,6 @@ class ImImageFile(ImageFile.ImageFile):
raise SyntaxError(msg) from e
if m:
k, v = m.group(1, 2)
# Don't know if this is the correct encoding,
@ -200,7 +196,6 @@ class ImImageFile(ImageFile.ImageFile):
n += 1
else:
msg = "Syntax error in IM header: " + s.decode("ascii", "replace")
raise SyntaxError(msg)
@ -252,7 +247,6 @@ class ImImageFile(ImageFile.ImageFile):
self._fp = self.fp # FIXME: hack
if self.rawmode[:2] == "F;":
# ifunc95 formats
try:
# use bit decoder (if necessary)
@ -332,7 +326,6 @@ SAVE = {
def _save(im, fp, filename):
try:
image_type, rawmode = SAVE[im.mode]
except KeyError as e:

3
src/PIL/Image.py
View File

@ -153,6 +153,7 @@ def isImageType(t):
#
# Constants
# transpose
class Transpose(IntEnum):
FLIP_LEFT_RIGHT = 0
@ -391,7 +392,6 @@ def init():
def _getdecoder(mode, decoder_name, args, extra=()):
# tweak arguments
if args is None:
args = ()
@ -415,7 +415,6 @@ def _getdecoder(mode, decoder_name, args, extra=()):
def _getencoder(mode, encoder_name, args, extra=()):
# tweak arguments
if args is None:
args = ()

4
src/PIL/ImageDraw.py
View File

@ -928,8 +928,8 @@ def floodfill(image, xy, value, border=None, thresh=0):
full_edge = set()
while edge:
new_edge = set()
for (x, y) in edge: # 4 adjacent method
for (s, t) in ((x + 1, y), (x - 1, y), (x, y + 1), (x, y - 1)):
for x, y in edge: # 4 adjacent method
for s, t in ((x + 1, y), (x - 1, y), (x, y + 1), (x, y - 1)):
# If already processed, or if a coordinate is negative, skip
if (s, t) in full_edge or s < 0 or t < 0:
continue

3
src/PIL/ImageFile.py
View File

@ -395,7 +395,6 @@ class Parser:
# parse what we have
if self.decoder:
if self.offset > 0:
# skip header
skip = min(len(self.data), self.offset)
@ -420,14 +419,12 @@ class Parser:
self.data = self.data[n:]
elif self.image:
# if we end up here with no decoder, this file cannot
# be incrementally parsed. wait until we've gotten all
# available data
pass
else:
# attempt to open this file
try:
with io.BytesIO(self.data) as fp:

2
src/PIL/ImageFont.py
View File

@ -90,7 +90,6 @@ class ImageFont:
"""PIL font wrapper"""
def _load_pilfont(self, filename):
with open(filename, "rb") as fp:
image = None
for ext in (".png", ".gif", ".pbm"):
@ -116,7 +115,6 @@ class ImageFont:
image.close()
def _load_pilfont_data(self, file, image):
# read PILfont header
if file.readline() != b"PILfont\n":
msg = "Not a PILfont file"

2
src/PIL/ImageOps.py
View File

@ -205,7 +205,6 @@ def colorize(image, black, white, mid=None, blackpoint=0, whitepoint=255, midpoi
# Create the mapping (2-color)
if mid is None:
range_map = range(0, whitepoint - blackpoint)
for i in range_map:
@ -215,7 +214,6 @@ def colorize(image, black, white, mid=None, blackpoint=0, whitepoint=255, midpoi
# Create the mapping (3-color)
else:
range_map1 = range(0, midpoint - blackpoint)
range_map2 = range(0, whitepoint - midpoint)

2
src/PIL/ImagePalette.py
View File

@ -248,11 +248,9 @@ def wedge(mode="RGB"):
def load(filename):
# FIXME: supports GIMP gradients only
with open(filename, "rb") as fp:
for paletteHandler in [
GimpPaletteFile.GimpPaletteFile,
GimpGradientFile.GimpGradientFile,

1
src/PIL/ImageShow.py
View File

@ -390,7 +390,6 @@ else:
if __name__ == "__main__":
if len(sys.argv) < 2:
print("Syntax: python3 ImageShow.py imagefile [title]")
sys.exit()

2
src/PIL/ImageTk.py
View File

@ -97,7 +97,6 @@ class PhotoImage:
"""
def __init__(self, image=None, size=None, **kw):
# Tk compatibility: file or data
if image is None:
image = _get_image_from_kw(kw)
@ -209,7 +208,6 @@ class BitmapImage:
"""
def __init__(self, image=None, **kw):
# Tk compatibility: file or data
if image is None:
image = _get_image_from_kw(kw)

5
src/PIL/ImtImagePlugin.py
View File

@ -30,12 +30,10 @@ field = re.compile(rb"([a-z]*) ([^ \r\n]*)")
class ImtImageFile(ImageFile.ImageFile):
format = "IMT"
format_description = "IM Tools"
def _open(self):
# Quick rejection: if there's not a LF among the first
# 100 bytes, this is (probably) not a text header.
@ -47,7 +45,6 @@ class ImtImageFile(ImageFile.ImageFile):
xsize = ysize = 0
while True:
if buffer:
s = buffer[:1]
buffer = buffer[1:]
@ -57,7 +54,6 @@ class ImtImageFile(ImageFile.ImageFile):
break
if s == b"\x0C":
# image data begins
self.tile = [
(
@ -71,7 +67,6 @@ class ImtImageFile(ImageFile.ImageFile):
break
else:
# read key/value pair
if b"\n" not in buffer:
buffer += self.fp.read(100)

3
src/PIL/IptcImagePlugin.py
View File

@ -48,7 +48,6 @@ def dump(c):
class IptcImageFile(ImageFile.ImageFile):
format = "IPTC"
format_description = "IPTC/NAA"
@ -84,7 +83,6 @@ class IptcImageFile(ImageFile.ImageFile):
return tag, size
def _open(self):
# load descriptive fields
while True:
offset = self.fp.tell()
@ -134,7 +132,6 @@ class IptcImageFile(ImageFile.ImageFile):
]
def load(self):
if len(self.tile) != 1 or self.tile[0][0] != "iptc":
return ImageFile.ImageFile.load(self)

5
src/PIL/JpegImagePlugin.py
View File

@ -344,12 +344,10 @@ def _accept(prefix):
class JpegImageFile(ImageFile.ImageFile):
format = "JPEG"
format_description = "JPEG (ISO 10918)"
def _open(self):
s = self.fp.read(3)
if not _accept(s):
@ -370,7 +368,6 @@ class JpegImageFile(ImageFile.ImageFile):
self.icclist = []
while True:
i = s[0]
if i == 0xFF:
s = s + self.fp.read(1)
@ -418,7 +415,6 @@ class JpegImageFile(ImageFile.ImageFile):
return s
def draft(self, mode, size):
if len(self.tile) != 1:
return
@ -455,7 +451,6 @@ class JpegImageFile(ImageFile.ImageFile):
return self.mode, box
def load_djpeg(self):
# ALTERNATIVE: handle JPEGs via the IJG command line utilities
f, path = tempfile.mkstemp()

2
src/PIL/McIdasImagePlugin.py
View File

@ -30,12 +30,10 @@ def _accept(s):
class McIdasImageFile(ImageFile.ImageFile):
format = "MCIDAS"
format_description = "McIdas area file"
def _open(self):
# parse area file directory
s = self.fp.read(256)
if not _accept(s) or len(s) != 256:

2
src/PIL/MicImagePlugin.py
View File

@ -34,13 +34,11 @@ def _accept(prefix):
class MicImageFile(TiffImagePlugin.TiffImageFile):
format = "MIC"
format_description = "Microsoft Image Composer"
_close_exclusive_fp_after_loading = False
def _open(self):
# read the OLE directory and see if this is a likely
# to be a Microsoft Image Composer file

2
src/PIL/MpegImagePlugin.py
View File

@ -58,12 +58,10 @@ class BitStream:
class MpegImageFile(ImageFile.ImageFile):
format = "MPEG"
format_description = "MPEG"
def _open(self):
s = BitStream(self.fp)
if s.read(32) != 0x1B3:

1
src/PIL/MpoImagePlugin.py
View File

@ -101,7 +101,6 @@ def _save_all(im, fp, filename):
class MpoImageFile(JpegImagePlugin.JpegImageFile):
format = "MPO"
format_description = "MPO (CIPA DC-007)"
_close_exclusive_fp_after_loading = False

4
src/PIL/MspImagePlugin.py
View File

@ -44,12 +44,10 @@ def _accept(prefix):
class MspImageFile(ImageFile.ImageFile):
format = "MSP"
format_description = "Windows Paint"
def _open(self):
# Header
s = self.fp.read(32)
if not _accept(s):
@ -111,7 +109,6 @@ class MspDecoder(ImageFile.PyDecoder):
_pulls_fd = True
def decode(self, buffer):
img = io.BytesIO()
blank_line = bytearray((0xFF,) * ((self.state.xsize + 7) // 8))
try:
@ -162,7 +159,6 @@ Image.register_decoder("MSP", MspDecoder)
def _save(im, fp, filename):
if im.mode != "1":
msg = f"cannot write mode {im.mode} as MSP"
raise OSError(msg)

3
src/PIL/PaletteFile.py
View File

@ -22,11 +22,9 @@ class PaletteFile:
rawmode = "RGB"
def __init__(self, fp):
self.palette = [(i, i, i) for i in range(256)]
while True:
s = fp.readline()
if not s:
@ -50,5 +48,4 @@ class PaletteFile:
self.palette = b"".join(self.palette)
def getpalette(self):
return self.palette, self.rawmode

4
src/PIL/PalmImagePlugin.py
View File

@ -112,9 +112,7 @@ _COMPRESSION_TYPES = {"none": 0xFF, "rle": 0x01, "scanline": 0x00}
def _save(im, fp, filename):
if im.mode == "P":
# we assume this is a color Palm image with the standard colormap,
# unless the "info" dict has a "custom-colormap" field
@ -147,14 +145,12 @@ def _save(im, fp, filename):
version = 1
elif im.mode == "1":
# monochrome -- write it inverted, as is the Palm standard
rawmode = "1;I"
bpp = 1
version = 0
else:
msg = f"cannot write mode {im.mode} as Palm"
raise OSError(msg)

2
src/PIL/PcdImagePlugin.py
View File

@ -24,12 +24,10 @@ from . import Image, ImageFile
class PcdImageFile(ImageFile.ImageFile):
format = "PCD"
format_description = "Kodak PhotoCD"
def _open(self):
# rough
self.fp.seek(2048)
s = self.fp.read(2048)

7
src/PIL/PcfFontFile.py
View File

@ -58,7 +58,6 @@ class PcfFontFile(FontFile.FontFile):
name = "name"
def __init__(self, fp, charset_encoding="iso8859-1"):
self.charset_encoding = charset_encoding
magic = l32(fp.read(4))
@ -92,7 +91,6 @@ class PcfFontFile(FontFile.FontFile):
self.glyph[ch] = glyph
def _getformat(self, tag):
format, size, offset = self.toc[tag]
fp = self.fp
@ -108,7 +106,6 @@ class PcfFontFile(FontFile.FontFile):
return fp, format, i16, i32
def _load_properties(self):
#
# font properties
@ -136,7 +133,6 @@ class PcfFontFile(FontFile.FontFile):
return properties
def _load_metrics(self):
#
# font metrics
@ -147,7 +143,6 @@ class PcfFontFile(FontFile.FontFile):
append = metrics.append
if (format & 0xFF00) == 0x100:
# "compressed" metrics
for i in range(i16(fp.read(2))):
left = i8(fp.read(1)) - 128
@ -160,7 +155,6 @@ class PcfFontFile(FontFile.FontFile):
append((xsize, ysize, left, right, width, ascent, descent, 0))
else:
# "jumbo" metrics
for i in range(i32(fp.read(4))):
left = i16(fp.read(2))
@ -176,7 +170,6 @@ class PcfFontFile(FontFile.FontFile):
return metrics
def _load_bitmaps(self, metrics):
#
# bitmap data

3
src/PIL/PcxImagePlugin.py
View File

@ -45,12 +45,10 @@ def _accept(prefix):
class PcxImageFile(ImageFile.ImageFile):
format = "PCX"
format_description = "Paintbrush"
def _open(self):
# header
s = self.fp.read(128)
if not _accept(s):
@ -143,7 +141,6 @@ SAVE = {
def _save(im, fp, filename):
try:
version, bits, planes, rawmode = SAVE[im.mode]
except KeyError as e:

2
src/PIL/PixarImagePlugin.py
View File

@ -35,12 +35,10 @@ def _accept(prefix):
class PixarImageFile(ImageFile.ImageFile):
format = "PIXAR"
format_description = "PIXAR raster image"
def _open(self):
# assuming a 4-byte magic label
s = self.fp.read(4)
if not _accept(s):

17
src/PIL/PngImagePlugin.py
View File

@ -161,7 +161,6 @@ def _crc32(data, seed=0):
class ChunkStream:
def __init__(self, fp):
self.fp = fp
self.queue = []
@ -195,7 +194,6 @@ class ChunkStream:
self.queue = self.fp = None
def push(self, cid, pos, length):
self.queue.append((cid, pos, length))
def call(self, cid, pos, length):
@ -230,7 +228,6 @@ class ChunkStream:
self.fp.read(4)
def verify(self, endchunk=b"IEND"):
# Simple approach; just calculate checksum for all remaining
# blocks. Must be called directly after open.
@ -397,7 +394,6 @@ class PngStream(ChunkStream):
self._seq_num = self.rewind_state["seq_num"]
def chunk_iCCP(self, pos, length):
# ICC profile
s = ImageFile._safe_read(self.fp, length)
# according to PNG spec, the iCCP chunk contains:
@ -425,7 +421,6 @@ class PngStream(ChunkStream):
return s
def chunk_IHDR(self, pos, length):
# image header
s = ImageFile._safe_read(self.fp, length)
if length < 13:
@ -446,7 +441,6 @@ class PngStream(ChunkStream):
return s
def chunk_IDAT(self, pos, length):
# image data
if "bbox" in self.im_info:
tile = [("zip", self.im_info["bbox"], pos, self.im_rawmode)]
@ -459,12 +453,10 @@ class PngStream(ChunkStream):
raise EOFError
def chunk_IEND(self, pos, length):
# end of PNG image
raise EOFError
def chunk_PLTE(self, pos, length):
# palette
s = ImageFile._safe_read(self.fp, length)
if self.im_mode == "P":
@ -472,7 +464,6 @@ class PngStream(ChunkStream):
return s
def chunk_tRNS(self, pos, length):
# transparency
s = ImageFile._safe_read(self.fp, length)
if self.im_mode == "P":
@ -524,7 +515,6 @@ class PngStream(ChunkStream):
return s
def chunk_pHYs(self, pos, length):
# pixels per unit
s = ImageFile._safe_read(self.fp, length)
if length < 9:
@ -542,7 +532,6 @@ class PngStream(ChunkStream):
return s
def chunk_tEXt(self, pos, length):
# text
s = ImageFile._safe_read(self.fp, length)
try:
@ -562,7 +551,6 @@ class PngStream(ChunkStream):
return s
def chunk_zTXt(self, pos, length):
# compressed text
s = ImageFile._safe_read(self.fp, length)
try:
@ -597,7 +585,6 @@ class PngStream(ChunkStream):
return s
def chunk_iTXt(self, pos, length):
# international text
r = s = ImageFile._safe_read(self.fp, length)
try:
@ -721,12 +708,10 @@ def _accept(prefix):
class PngImageFile(ImageFile.ImageFile):
format = "PNG"
format_description = "Portable network graphics"
def _open(self):
if not _accept(self.fp.read(8)):
msg = "not a PNG file"
raise SyntaxError(msg)
@ -740,7 +725,6 @@ class PngImageFile(ImageFile.ImageFile):
self.png = PngStream(self.fp)
while True:
#
# get next chunk
@ -1264,7 +1248,6 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
mode = im.mode
if mode == "P":
#
# attempt to minimize storage requirements for palette images
if "bits" in im.encoderinfo:

1
src/PIL/PpmImagePlugin.py
View File

@ -51,7 +51,6 @@ def _accept(prefix):
class PpmImageFile(ImageFile.ImageFile):
format = "PPM"
format_description = "Pbmplus image"

4
src/PIL/PsdImagePlugin.py
View File

@ -51,13 +51,11 @@ def _accept(prefix):
class PsdImageFile(ImageFile.ImageFile):
format = "PSD"
format_description = "Adobe Photoshop"
_close_exclusive_fp_after_loading = False
def _open(self):
read = self.fp.read
#
@ -177,7 +175,6 @@ def _layerinfo(fp, ct_bytes):
raise SyntaxError(msg)
for _ in range(abs(ct)):
# bounding box
y0 = i32(read(4))
x0 = i32(read(4))
@ -250,7 +247,6 @@ def _layerinfo(fp, ct_bytes):
def _maketile(file, mode, bbox, channels):
tile = None
read = file.read

2
src/PIL/SgiImagePlugin.py
View File

@ -49,12 +49,10 @@ MODES = {
##
# Image plugin for SGI images.
class SgiImageFile(ImageFile.ImageFile):
format = "SGI"
format_description = "SGI Image File Format"
def _open(self):
# HEAD
headlen = 512
s = self.fp.read(headlen)

Some files were not shown because too many files have changed in this diff Show More