Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 19:08:43 -05:00
Code Issues Projects Releases Packages Wiki Activity

Replace returnValue with return (#5736)

Browse source
This commit is contained in:
Amber Brown 2019-07-23 23:00:55 +10:00 • committed by GitHub
parent 18a466b84e
commit 4806651744
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
177 changed files with 1359 additions and 1513 deletions
Download patch file Download diff file Expand all files Collapse all files

18
synapse/rest/media/v1/media_repository.py
View file

@ -171,7 +171,7 @@ class MediaRepository(object):
yield self._generate_thumbnails(None, media_id, media_id, media_type)
defer.returnValue("mxc://%s/%s" % (self.server_name, media_id))
return "mxc://%s/%s" % (self.server_name, media_id)
@defer.inlineCallbacks
def get_local_media(self, request, media_id, name):
@ -282,7 +282,7 @@ class MediaRepository(object):
with responder:
pass
defer.returnValue(media_info)
return media_info
@defer.inlineCallbacks
def _get_remote_media_impl(self, server_name, media_id):
@ -317,14 +317,14 @@ class MediaRepository(object):
responder = yield self.media_storage.fetch_media(file_info)
if responder:
defer.returnValue((responder, media_info))
return (responder, media_info)
# Failed to find the file anywhere, lets download it.
media_info = yield self._download_remote_file(server_name, media_id, file_id)
responder = yield self.media_storage.fetch_media(file_info)
defer.returnValue((responder, media_info))
return (responder, media_info)
@defer.inlineCallbacks
def _download_remote_file(self, server_name, media_id, file_id):
@ -421,7 +421,7 @@ class MediaRepository(object):
yield self._generate_thumbnails(server_name, media_id, file_id, media_type)
defer.returnValue(media_info)
return media_info
def _get_thumbnail_requirements(self, media_type):
return self.thumbnail_requirements.get(media_type, ())
@ -500,7 +500,7 @@ class MediaRepository(object):
media_id, t_width, t_height, t_type, t_method, t_len
)
defer.returnValue(output_path)
return output_path
@defer.inlineCallbacks
def generate_remote_exact_thumbnail(
@ -554,7 +554,7 @@ class MediaRepository(object):
t_len,
)
defer.returnValue(output_path)
return output_path
@defer.inlineCallbacks
def _generate_thumbnails(
@ -667,7 +667,7 @@ class MediaRepository(object):
media_id, t_width, t_height, t_type, t_method, t_len
)
defer.returnValue({"width": m_width, "height": m_height})
return {"width": m_width, "height": m_height}
@defer.inlineCallbacks
def delete_old_remote_media(self, before_ts):
@ -704,7 +704,7 @@ class MediaRepository(object):
yield self.store.delete_remote_media(origin, media_id)
deleted += 1
defer.returnValue({"deleted": deleted})
return {"deleted": deleted}
class MediaRepositoryResource(Resource):