Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

synapse/app: frontend_proxy.py: actually make workers work on py3

This commit is contained in:
Ivan Shapovalov 2018-10-14 11:37:38 +03:00
parent fb216a22db
commit 06bc8d2fe5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4033.bugfix
View File

@ -1 +1,2 @@
Synapse now starts on Python 3.7. Synapse now starts on Python 3.7.
_All_ workers now start on Python 3.

4
synapse/app/frontend_proxy.py
View File

@ -68,7 +68,7 @@ class PresenceStatusStubServlet(ClientV1RestServlet):
"Authorization": auth_headers, "Authorization": auth_headers,
} }
result = yield self.http_client.get_json( result = yield self.http_client.get_json(
self.main_uri + request.uri, self.main_uri + request.uri.decode('ascii'),
headers=headers, headers=headers,
) )
defer.returnValue((200, result)) defer.returnValue((200, result))
@ -125,7 +125,7 @@ class KeyUploadServlet(RestServlet):
"Authorization": auth_headers, "Authorization": auth_headers,
} }
result = yield self.http_client.post_json_get_json( result = yield self.http_client.post_json_get_json(
self.main_uri + request.uri, self.main_uri + request.uri.decode('ascii'),
body, body,
headers=headers, headers=headers,
) )