Skip to content

Commit

Permalink
Add deprecation helper for Image.new with BGR; modes
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk committed Apr 25, 2024
1 parent 02db411 commit 0099de0
Showing 1 changed file with 13 additions and 20 deletions.
33 changes: 13 additions & 20 deletions Tests/test_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,19 @@
image_mode_names = [name for name, _ in image_modes]


# Deprecation helper
def helper_image_new(mode: str, size: tuple[int, int]) -> Image.Image:
if mode.startswith("BGR;"):
with pytest.warns(DeprecationWarning):
return Image.new(mode, size)
else:
return Image.new(mode, size)


class TestImage:
@pytest.mark.parametrize("mode", image_mode_names)
def test_image_modes_success(self, mode: str) -> None:
if mode.startswith("BGR;"):
with pytest.warns(DeprecationWarning):
Image.new(mode, (1, 1))
else:
Image.new(mode, (1, 1))
helper_image_new(mode, (1, 1))

@pytest.mark.parametrize("mode", ("", "bad", "very very long"))
def test_image_modes_fail(self, mode: str) -> None:
Expand Down Expand Up @@ -1066,29 +1071,17 @@ def test_roundtrip_bytes_method(self, mode: str) -> None:
im = hopper(mode)
source_bytes = im.tobytes()

if mode.startswith("BGR;"):
with pytest.warns(DeprecationWarning):
reloaded = Image.new(mode, im.size)
else:
reloaded = Image.new(mode, im.size)
reloaded = helper_image_new(mode, im.size)
reloaded.frombytes(source_bytes)
assert reloaded.tobytes() == source_bytes

@pytest.mark.parametrize(("mode", "pixelsize"), image_modes)
def test_getdata_putdata(self, mode: str, pixelsize: int) -> None:
if mode.startswith("BGR;"):
with pytest.warns(DeprecationWarning):
im = Image.new(mode, (2, 2))
else:
im = Image.new(mode, (2, 2))
im = helper_image_new(mode, (2, 2))
source_bytes = bytes(range(im.width * im.height * pixelsize))
im.frombytes(source_bytes)

if mode.startswith("BGR;"):
with pytest.warns(DeprecationWarning):
reloaded = Image.new(mode, im.size)
else:
reloaded = Image.new(mode, im.size)
reloaded = helper_image_new(mode, im.size)
reloaded.putdata(im.getdata())
assert_image_equal(im, reloaded)

Expand Down

0 comments on commit 0099de0

Please sign in to comment.