diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:52 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:52 +0100 |
| commit | 6efb2b0ad44b4cfb1f05a77c1a5a22b527758b37 (patch) | |
| tree | 56c11988292ef856c99e8fb4f9b08b648e5d93d8 /synapse/rest/media | |
| parent | Merge branch 'develop' into babolivier/mark_unread (diff) | |
| parent | Discard RDATA from already seen positions. (#7648) (diff) | |
| download | synapse-6efb2b0ad44b4cfb1f05a77c1a5a22b527758b37.tar.xz | |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'synapse/rest/media')
| -rw-r--r-- | synapse/rest/media/v1/media_repository.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/rest/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py index fd10d42f2f..4ee8c60257 100644 --- a/synapse/rest/media/v1/media_repository.py +++ b/synapse/rest/media/v1/media_repository.py @@ -20,8 +20,6 @@ import os import shutil from typing import Dict, Tuple -from six import iteritems - import twisted.internet.error import twisted.web.http from twisted.web.resource import Resource @@ -606,7 +604,7 @@ class MediaRepository(object): thumbnails[(t_width, t_height, r_type)] = r_method # Now we generate the thumbnails for each dimension, store it - for (t_width, t_height, t_type), t_method in iteritems(thumbnails): + for (t_width, t_height, t_type), t_method in thumbnails.items(): # Generate the thumbnail if t_method == "crop": t_byte_source = await defer_to_thread( |