mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-26 04:05:38 +00:00
Merge pull request #4033 from intelfx/py37-hotfixes
py3: python3.7 hotfixes
This commit is contained in:
commit
f9ce1b4eb0
2
changelog.d/4033.bugfix
Normal file
2
changelog.d/4033.bugfix
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
Synapse now starts on Python 3.7.
|
||||||
|
_All_ workers now start on Python 3.
|
@ -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,
|
||||||
)
|
)
|
||||||
|
@ -219,7 +219,7 @@ def filter_events_for_server(store, server_name, events):
|
|||||||
# Whatever else we do, we need to check for senders which have requested
|
# Whatever else we do, we need to check for senders which have requested
|
||||||
# erasure of their data.
|
# erasure of their data.
|
||||||
erased_senders = yield store.are_users_erased(
|
erased_senders = yield store.are_users_erased(
|
||||||
e.sender for e in events,
|
(e.sender for e in events),
|
||||||
)
|
)
|
||||||
|
|
||||||
def redact_disallowed(event, state):
|
def redact_disallowed(event, state):
|
||||||
|
Loading…
Reference in New Issue
Block a user