diff options
| author | David Robertson <davidr@element.io> | 2022-05-09 11:48:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 10:48:14 +0000 |
| commit | 8de0facaae08c422cbf1acefe898820d3bf5c632 (patch) | |
| tree | 9af06d33baaae8442c1d718dd64747ec7e444759 | |
| parent | Update changelog for #12587 to be more accurate (#12663) (diff) | |
| download | synapse-8de0facaae08c422cbf1acefe898820d3bf5c632.tar.xz | |
Fix mypy against latest pillow stubs (#12671)
| -rw-r--r-- | changelog.d/12671.misc | 1 | ||||
| -rw-r--r-- | poetry.lock | 6 | ||||
| -rw-r--r-- | synapse/rest/media/v1/thumbnailer.py | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/changelog.d/12671.misc b/changelog.d/12671.misc new file mode 100644 index 0000000000..56df4e3831 --- /dev/null +++ b/changelog.d/12671.misc @@ -0,0 +1 @@ +Fix mypy against latest pillow stubs. diff --git a/poetry.lock b/poetry.lock index f649efdf2b..49a912a589 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1371,7 +1371,7 @@ python-versions = "*" [[package]] name = "types-pillow" -version = "9.0.6" +version = "9.0.15" description = "Typing stubs for Pillow" category = "dev" optional = false @@ -2626,8 +2626,8 @@ types-opentracing = [ {file = "types_opentracing-2.4.7-py3-none-any.whl", hash = "sha256:861fb8103b07cf717f501dd400cb274ca9992552314d4d6c7a824b11a215e512"}, ] types-pillow = [ - {file = "types-Pillow-9.0.6.tar.gz", hash = "sha256:79b350b1188c080c27558429f1e119e69c9f020b877a82df761d9283070e0185"}, - {file = "types_Pillow-9.0.6-py3-none-any.whl", hash = "sha256:bd1e0a844fc718398aa265bf50fcad550fc520cc54f80e5ffeb7b3226b3cc507"}, + {file = "types-Pillow-9.0.15.tar.gz", hash = "sha256:d2e385fe5c192e75970f18accce69f5c2a9f186f3feb578a9b91cd6fdf64211d"}, + {file = "types_Pillow-9.0.15-py3-none-any.whl", hash = "sha256:c9646595dfafdf8b63d4b1443292ead17ee0fc7b18a143e497b68e0ea2dc1eb6"}, ] types-psycopg2 = [ {file = "types-psycopg2-2.9.9.tar.gz", hash = "sha256:4f9d4d52eeb343dc00fd5ed4f1513a8a5c18efba0a072eb82706d15cf4f20a2e"}, diff --git a/synapse/rest/media/v1/thumbnailer.py b/synapse/rest/media/v1/thumbnailer.py index 5e17664b5b..390491eb83 100644 --- a/synapse/rest/media/v1/thumbnailer.py +++ b/synapse/rest/media/v1/thumbnailer.py @@ -121,10 +121,10 @@ class Thumbnailer: # # 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: |