Simplified code

Author: radarhere

Tests/test_imagecolor.py

@@ -200,13 +200,11 @@ def test_color_hsv() -> None:
 
 
 @pytest.mark.parametrize("mode, premultiplied_mode", (("LA", "La"), ("RGBA", "RGBa")))
-@pytest.mark.parametrize("color", ("red", "#ff000080"))
-def test_color_premultiplied(mode: str, premultiplied_mode: str, color: str) -> None:
-    # The premultiplied modes are spelled with a lowercase "a", so an
-    # uppercase-only check drops their alpha. Compare against convert().
-    expected = (
-        Image.new(mode, (1, 1), color).convert(premultiplied_mode).getpixel((0, 0))
-    )
+@pytest.mark.parametrize("color", ("#f00", "#ff000080"))
+def test_color_premultiplied_alpha(mode: str, premultiplied_mode: str, color: str) -> None:
+    im = Image.new(mode, (1, 1), color)
+    im_premultiplied = im.convert(premultiplied_mode)
+    expected = im_premultiplied.getpixel((0, 0))
 
     assert ImageColor.getcolor(color, premultiplied_mode) == expected
 

src/PIL/ImageColor.py

@@ -152,26 +152,20 @@ def getcolor(color: str, mode: str) -> int | tuple[int, ...]:
         r, g, b = rgb
         h, s, v = rgb_to_hsv(r / 255, g / 255, b / 255)
         return int(h * 255), int(s * 255), int(v * 255)
-    elif Image.getmodebase(mode) == "L":
+    if Image.getmodebase(mode) == "L":
         r, g, b = rgb
         # ITU-R Recommendation 601-2 for nonlinear RGB
         # scaled to 24 bits to match the convert's implementation.
         graylevel = (r * 19595 + g * 38470 + b * 7471 + 0x8000) >> 16
-        if mode[-1] == "A":
-            return graylevel, alpha
-        if mode[-1] == "a":
-            return _premultiply(graylevel, alpha), alpha
-        return graylevel
-    elif mode[-1] == "A":
-        return rgb + (alpha,)
-    elif mode[-1] == "a":
-        return tuple(_premultiply(band, alpha) for band in rgb) + (alpha,)
-    return rgb
-
-
-def _premultiply(band: int, alpha: int) -> int:
-    # Rounded, to match convert()'s premultiplication.
-    return (band * alpha + 127) // 255
+        value = (graylevel,)
+    else:
+        value = rgb
+    if mode[-1] == "a":
+        # Rounded, to match convert()'s premultiplication.
+        value = tuple((band * alpha + 127) // 255 for band in value)
+    if mode[-1] in ("A", "a"):
+        return value + (alpha,)
+    return value[0] if len(value) == 1 else value
 
 
 colormap: dict[str, str | tuple[int, int, int]] = {