Fix mypy against latest pillow stubs (#12671)

matrix-org · May 9, 2022 · 8de0fac · 8de0fac
1 parent 41a882e
commit 8de0fac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/changelog.d/12671.misc b/changelog.d/12671.misc
@@ -0,0 +1 @@
+Fix mypy against latest pillow stubs.
diff --git a/poetry.lock b/poetry.lock
diff --git a/synapse/rest/media/v1/thumbnailer.py b/synapse/rest/media/v1/thumbnailer.py
@@ -121,10 +121,10 @@ def _resize(self, width: int, height: int) -> Image.Image:
         #
         # If the image has transparency, use RGBA instead.
         if self.image.mode in ["1", "L", "P"]:
-            mode = "RGB"
             if self.image.info.get("transparency", None) is not None:
-                mode = "RGBA"
-            self.image = self.image.convert(mode)
+                self.image = self.image.convert("RGBA")
+            else:
+                self.image = self.image.convert("RGB")
         return self.image.resize((width, height), Image.ANTIALIAS)
 
     def scale(self, width: int, height: int, output_type: str) -> BytesIO: