python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-13 05:06:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

use namedtuple for image mode info

Browse Source
This commit is contained in:
Yay295 2024-03-27 10:29:19 -05:00
parent f8160b858a
commit 139245a3db
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Tests/test_image.py
View File

@ -8,7 +8,7 @@ import sys
import tempfile import tempfile
import warnings import warnings
from pathlib import Path from pathlib import Path
from typing import IO from typing import IO, NamedTuple
import pytest import pytest
@ -33,34 +33,39 @@ from .helper import (
skip_unless_feature, skip_unless_feature,
) )
# name, pixel size
class ImageModeInfo(NamedTuple):
name: str
pixel_size: int
image_modes = ( image_modes = (
("1", 1), ImageModeInfo("1", 1),
("L", 1), ImageModeInfo("L", 1),
("LA", 4), ImageModeInfo("LA", 4),
("La", 4), ImageModeInfo("La", 4),
("P", 1), ImageModeInfo("P", 1),
("PA", 4), ImageModeInfo("PA", 4),
("F", 4), ImageModeInfo("F", 4),
("I", 4), ImageModeInfo("I", 4),
("I;16", 2), ImageModeInfo("I;16", 2),
("I;16L", 2), ImageModeInfo("I;16L", 2),
("I;16B", 2), ImageModeInfo("I;16B", 2),
("I;16N", 2), ImageModeInfo("I;16N", 2),
("RGB", 4), ImageModeInfo("RGB", 4),
("RGBA", 4), ImageModeInfo("RGBA", 4),
("RGBa", 4), ImageModeInfo("RGBa", 4),
("RGBX", 4), ImageModeInfo("RGBX", 4),
("BGR;15", 2), ImageModeInfo("BGR;15", 2),
("BGR;16", 2), ImageModeInfo("BGR;16", 2),
("BGR;24", 3), ImageModeInfo("BGR;24", 3),
("CMYK", 4), ImageModeInfo("CMYK", 4),
("YCbCr", 4), ImageModeInfo("YCbCr", 4),
("HSV", 4), ImageModeInfo("HSV", 4),
("LAB", 4), ImageModeInfo("LAB", 4),
) )
image_mode_names = [name for name, _ in image_modes] image_mode_names = [mode.name for mode in image_modes]
class TestImage: class TestImage:
@ -1062,13 +1067,13 @@ class TestImageBytes:
reloaded.frombytes(source_bytes) reloaded.frombytes(source_bytes)
assert reloaded.tobytes() == source_bytes assert reloaded.tobytes() == source_bytes
@pytest.mark.parametrize(("mode", "pixelsize"), image_modes) @pytest.mark.parametrize("mode", image_modes)
def test_getdata_putdata(self, mode: str, pixelsize: int) -> None: def test_getdata_putdata(self, mode: ImageModeInfo) -> None:
im = Image.new(mode, (2, 2)) im = Image.new(mode.name, (2, 2))
source_bytes = bytes(range(im.width * im.height * pixelsize)) source_bytes = bytes(range(im.width * im.height * mode.pixel_size))
im.frombytes(source_bytes) im.frombytes(source_bytes)
reloaded = Image.new(mode, im.size) reloaded = Image.new(mode.name, im.size)
reloaded.putdata(im.getdata()) reloaded.putdata(im.getdata())
assert_image_equal(im, reloaded) assert_image_equal(im, reloaded)