Merge pull request #2 from radarhere/fix6652/imagepalette_rgba_color

Corrected test
bigcat88 · Oct 10, 2022 · 9133f35 · 9133f35
2 parents f9a3178 + 0b2cef5
commit 9133f35
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/Tests/test_image_access.py b/Tests/test_image_access.py
@@ -345,13 +345,14 @@ def test_reference_counting(self):
 
     @pytest.mark.parametrize("mode", ("P", "PA"))
     def test_p_putpixel_rgb_rgba(self, mode):
-        for color in [(255, 0, 0), (255, 0, 0, 127)]:
+        for color in ((255, 0, 0), (255, 0, 0, 127 if mode == "PA" else 255)):
             im = Image.new(mode, (1, 1))
             access = PyAccess.new(im, False)
             access.putpixel((0, 0), color)
 
-            alpha = color[3] if len(color) == 4 and mode == "PA" else 255
-            assert im.convert("RGBA").getpixel((0, 0)) == (255, 0, 0, alpha)
+            if len(color) == 3:
+                color += (255,)
+            assert im.convert("RGBA").getpixel((0, 0)) == color
 
 
 class TestImagePutPixelError(AccessTest):

diff --git a/Tests/test_imagepalette.py b/Tests/test_imagepalette.py
@@ -50,11 +50,12 @@ def test_getcolor():
         palette.getcolor("unknown")
 
 
-def test_getcolor_raises_on_incompatible_color():
-    palette = ImagePalette.ImagePalette(mode="RGB")
-    # Opaque RGBA colors should work
-    palette.getcolor((0, 0, 0, 255))
-    assert palette.getcolor((0, 0, 0)) == palette.getcolor((0, 0, 0, 255))
+def test_getcolor_rgba_color_rgb_palette():
+    palette = ImagePalette.ImagePalette("RGB")
+
+    # Opaque RGBA colors are converted
+    assert palette.getcolor((0, 0, 0, 255)) == palette.getcolor((0, 0, 0))
+
     with pytest.raises(ValueError):
         palette.getcolor((0, 0, 0, 128))
 

diff --git a/src/PIL/ImagePalette.py b/src/PIL/ImagePalette.py
@@ -114,13 +114,13 @@ def getcolor(self, color, image=None):
         if self.rawmode:
             raise ValueError("palette contains raw palette data")
         if isinstance(color, tuple):
-            if self.mode == "RGB" and len(color) == 4:
-                if color[3] == 255:
+            if self.mode == "RGB":
+                if len(color) == 4:
+                    if color[3] != 255:
+                        raise ValueError(
+                            "cannot add non-opaque RGBA color to RGB palette"
+                        )
                     color = color[:3]
-                else:
-                    raise ValueError(
-                        "RGB ImagePalette can't handle non-opaque RGBA colors"
-                    )
             elif self.mode == "RGBA":
                 if len(color) == 3:
                     color += (255,)