Replace returnValue with return (#5736)

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

View file

@ -48,7 +48,7 @@ class ProfileDisplaynameRestServlet(RestServlet):
if displayname is not None:
ret["displayname"] = displayname
defer.returnValue((200, ret))
return (200, ret)
@defer.inlineCallbacks
def on_PUT(self, request, user_id):
@ -61,11 +61,11 @@ class ProfileDisplaynameRestServlet(RestServlet):
try:
new_name = content["displayname"]
except Exception:
defer.returnValue((400, "Unable to parse name"))
return (400, "Unable to parse name")
yield self.profile_handler.set_displayname(user, requester, new_name, is_admin)
defer.returnValue((200, {}))
return (200, {})
def on_OPTIONS(self, request, user_id):
return (200, {})
@ -98,7 +98,7 @@ class ProfileAvatarURLRestServlet(RestServlet):
if avatar_url is not None:
ret["avatar_url"] = avatar_url
defer.returnValue((200, ret))
return (200, ret)
@defer.inlineCallbacks
def on_PUT(self, request, user_id):
@ -110,11 +110,11 @@ class ProfileAvatarURLRestServlet(RestServlet):
try:
new_name = content["avatar_url"]
except Exception:
defer.returnValue((400, "Unable to parse name"))
return (400, "Unable to parse name")
yield self.profile_handler.set_avatar_url(user, requester, new_name, is_admin)
defer.returnValue((200, {}))
return (200, {})
def on_OPTIONS(self, request, user_id):
return (200, {})
@ -150,7 +150,7 @@ class ProfileRestServlet(RestServlet):
if avatar_url is not None:
ret["avatar_url"] = avatar_url
defer.returnValue((200, ret))
return (200, ret)
def register_servlets(hs, http_server):