Fix various type hints

Author: codingjoe

pictures/models.py

@@ -105,7 +105,7 @@ def name(self) -> str:
     def path(self) -> Path:
         return Path(self.storage.path(self.name))
 
-    def process(self, image) -> Image:
+    def process(self, image) -> Image.Image:
         image = ImageOps.exif_transpose(image)  # crates a copy
         height = self.height or self.width / Fraction(*image.size)
         size = math.floor(self.width), math.floor(height)
@@ -130,7 +130,9 @@ def delete(self):
 
 
 class PictureFieldFile(ImageFieldFile):
-    def __xor__(self, other) -> tuple[set[Picture], set[Picture]]:
+    def __xor__(
+        self, other
+    ) -> tuple[set[Picture], set[Picture]] | type[NotImplemented]:
         """Return the new and obsolete :class:`Picture` instances."""
         if not isinstance(other, PictureFieldFile):
             return NotImplemented
@@ -192,7 +194,7 @@ def height(self):
         return self._get_image_dimensions()[1]
 
     @property
-    def aspect_ratios(self) -> {Fraction | None: {str: {int: Picture}}}:
+    def aspect_ratios(self) -> dict[Fraction | None, dict[str, dict[int, Picture]]]:
         self._require_file()
         return self.get_picture_files(
             file_name=self.name,
@@ -210,7 +212,7 @@ def get_picture_files(
         img_height: int,
         storage: Storage,
         field: PictureField,
-    ) -> {Fraction | None: {str: {int: Picture}}}:
+    ) -> dict[Fraction | None, dict[str, dict[int, Picture]]]:
         PictureClass = import_string(conf.get_settings().PICTURE_CLASS)
         return {
             ratio: {

pictures/templatetags/pictures.py

@@ -20,9 +20,12 @@ def picture(field_file, img_alt=None, ratio=None, container=None, **kwargs):
     img_attrs = {
         "src": field_file.url,
         "alt": img_alt,
-        "width": field_file.width,
-        "height": field_file.height,
     }
+    if ratio is None:
+        img_attrs |= {
+            "width": field_file.width,
+            "height": field_file.height,
+        }
     try:
         sources = field_file.aspect_ratios[ratio]
     except KeyError as e:

pictures/utils.py

@@ -61,7 +61,7 @@ def sizes(
 
 
 def source_set(
-    size: (int, int), *, ratio: str | Fraction | None, max_width: int, cols: int
+    size: tuple[int, int], *, ratio: str | Fraction | None, max_width: int, cols: int
 ) -> set:
     ratio = Fraction(ratio) if ratio else None
     img_width, img_height = size
@@ -82,8 +82,8 @@ def placeholder(width: int, height: int, alt):
     hue = random.randint(0, 360)  # NoQA S311
     img = Image.new("RGB", (width, height), color=f"hsl({hue}, 40%, 80%)")
     draw = ImageDraw.Draw(img)
-    draw.line(((0, 0, width, height)), width=3, fill=f"hsl({hue}, 60%, 20%)")
-    draw.line(((0, height, width, 0)), width=3, fill=f"hsl({hue}, 60%, 20%)")
+    draw.line((0, 0, width, height), width=3, fill=f"hsl({hue}, 60%, 20%)")
+    draw.line((0, height, width, 0), width=3, fill=f"hsl({hue}, 60%, 20%)")
     draw.rectangle(
         (width / 4, height / 4, width * 3 / 4, height * 3 / 4),
         fill=f"hsl({hue}, 40%, 80%)",

tests/test_utils.py

@@ -145,14 +145,14 @@ def test_placeholder():
     assert img.height == 1200
 
 
-class TestPicture(Picture):
+class SamplePicture(Picture):
     @property
     def url(self):
         return f"/media/{self.parent_name}"
 
 
 def test_reconstruct(image_upload_file):
-    picture = TestPicture(
+    picture = SamplePicture(
         image_upload_file.name,
         "WEBP",
         "16/9",
@@ -173,7 +173,7 @@ def test_reconstruct(image_upload_file):
             "storage": default_storage,
             "width": 100,
         },
-    ) == TestPicture(
+    ) == SamplePicture(
         "test.jpg",
         "JPEG",
         "16/9",