Updated type hints

Author: radarhere

Tests/test_imageops.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import cast
-
 import pytest
 
 from PIL import Image, ImageDraw, ImageOps, ImageStat, features
@@ -612,8 +610,8 @@ def test_sepia_preserves_size_and_mode() -> None:
     img = Image.new("RGB", (10, 10), (100, 150, 200))
     out = ImageOps.sepia(img)
 
-    assert out.size == img.size
     assert out.mode == "RGB"
+    assert out.size == img.size
 
 
 def test_sobel_detects_edge() -> None:
@@ -645,8 +643,9 @@ def test_glow_mask_increases_intensity() -> None:
     img = Image.new("L", (1, 1), 128)
     out = ImageOps._glow_mask(img)
 
-    v = cast(int, out.getpixel((0, 0)))
-    assert v > 128
+    value = out.getpixel((0, 0))
+    assert isinstance(value, int)
+    assert value > 128
 
 
 def test_neon_colorize_output_mode() -> None:
@@ -681,7 +680,7 @@ def test_neon_blend_alpha_one() -> None:
 
 
 def test_neon_effect_mode_and_size() -> None:
-    img = Image.new("RGB", (20, 20), "black")
+    img = Image.new("RGB", (20, 20))
     out = ImageOps.neon_effect(img)
 
     assert out.mode == "RGB"

src/PIL/ImageOps.py

@@ -634,11 +634,10 @@ def sepia(image: Image.Image) -> Image.Image:
     if image.mode != "RGB":
         image = image.convert("RGB")
 
-    width, height = image.size
-    out = Image.new("RGB", (width, height))
+    out = Image.new("RGB", image.size)
 
-    for x in range(width):
-        for y in range(height):
+    for x in range(image.width):
+        for y in range(image.height):
             r, g, b = cast(tuple[int, int, int], image.getpixel((x, y)))
 
             tr = int(0.393 * r + 0.769 * g + 0.189 * b)
@@ -665,22 +664,22 @@ def sobel(image: Image.Image) -> Image.Image:
     :return: An image.
     """
     image = image.convert("L")
-    width, height = image.size
 
     Kx = [[-1, 0, 1], [-2, 0, 2], [-1, 0, 1]]
 
     Ky = [[1, 2, 1], [0, 0, 0], [-1, -2, -1]]
 
-    out = Image.new("L", (width, height))
+    out = Image.new("L", image.size)
 
-    for y in range(1, height - 1):
-        for x in range(1, width - 1):
+    for y in range(1, image.height - 1):
+        for x in range(1, image.width - 1):
 
             gx = gy = 0
 
             for dy in (-1, 0, 1):
                 for dx in (-1, 0, 1):
-                    v = cast(int, image.getpixel((x + dx, y + dy)))
+                    v = image.getpixel((x + dx, y + dy))
+                    assert isinstance(v, int)
 
                     kx = Kx[dy + 1][dx + 1]
                     ky = Ky[dy + 1][dx + 1]
@@ -702,8 +701,8 @@ def _glow_mask(edge_img: Image.Image) -> Image.Image:
     :return: An image.
     """
 
-    def screen_point(x):
-        return 255 - ((255 - x) * (255 - x) // 255)
+    def screen_point(value: int) -> int:
+        return 255 - ((255 - value) * (255 - value) // 255)
 
     return edge_img.point(screen_point)
 
@@ -716,12 +715,12 @@ def _neon_colorize(mask: Image.Image, color: tuple[int, int, int]) -> Image.Imag
     :return: An image
     """
     r, g, b = color
-    width, height = mask.size
-    out = Image.new("RGB", (width, height))
+    out = Image.new("RGB", mask.size)
 
-    for y in range(height):
-        for x in range(width):
-            v = cast(int, mask.getpixel((x, y)))
+    for y in range(mask.height):
+        for x in range(mask.width):
+            v = mask.getpixel((x, y))
+            assert isinstance(v, int)
 
             out.putpixel(
                 (x, y),
@@ -751,11 +750,10 @@ def _neon_blend(
     if alpha > 1:
         alpha = 1
 
-    width, height = original.size
-    out = Image.new("RGB", (width, height))
+    out = Image.new("RGB", original.size)
 
-    for y in range(height):
-        for x in range(width):
+    for y in range(original.height):
+        for x in range(original.width):
             r1, g1, b1 = cast(tuple[int, int, int], original.getpixel((x, y)))
             r2, g2, b2 = cast(tuple[int, int, int], neon.getpixel((x, y)))