From 0099de0ed904c2021850fbb5a19908c36f908890 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Thu, 25 Apr 2024 16:00:14 +0300
Subject: [PATCH] Add deprecation helper for Image.new with BGR; modes

---
 Tests/test_image.py | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/Tests/test_image.py b/Tests/test_image.py
index ed80be503fb..e8339424d99 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -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:
@@ -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)