This converts calls like super(Foo, self) -> super(). Generated with: sed -i "" -Ee 's/super\([^\(]+\)/super()/g' **/*.pytags/v1.21.0rc1
@@ -0,0 +1 @@ | |||
Simplify `super()` calls to Python 3 syntax. |
@@ -11,7 +11,7 @@ import yaml | |||
class DefinitionVisitor(ast.NodeVisitor): | |||
def __init__(self): | |||
super(DefinitionVisitor, self).__init__() | |||
super().__init__() | |||
self.functions = {} | |||
self.classes = {} | |||
self.names = {} | |||
@@ -321,7 +321,7 @@ class MatrixConnectionAdapter(HTTPAdapter): | |||
url = urlparse.urlunparse( | |||
("https", netloc, parsed.path, parsed.params, parsed.query, parsed.fragment) | |||
) | |||
return super(MatrixConnectionAdapter, self).get_connection(url, proxies) | |||
return super().get_connection(url, proxies) | |||
if __name__ == "__main__": | |||
@@ -87,7 +87,7 @@ class CodeMessageException(RuntimeError): | |||
""" | |||
def __init__(self, code: Union[int, HTTPStatus], msg: str): | |||
super(CodeMessageException, self).__init__("%d: %s" % (code, msg)) | |||
super().__init__("%d: %s" % (code, msg)) | |||
# Some calls to this method pass instances of http.HTTPStatus for `code`. | |||
# While HTTPStatus is a subclass of int, it has magic __str__ methods | |||
@@ -138,7 +138,7 @@ class SynapseError(CodeMessageException): | |||
msg: The human-readable error message. | |||
errcode: The matrix error code e.g 'M_FORBIDDEN' | |||
""" | |||
super(SynapseError, self).__init__(code, msg) | |||
super().__init__(code, msg) | |||
self.errcode = errcode | |||
def error_dict(self): | |||
@@ -159,7 +159,7 @@ class ProxiedRequestError(SynapseError): | |||
errcode: str = Codes.UNKNOWN, | |||
additional_fields: Optional[Dict] = None, | |||
): | |||
super(ProxiedRequestError, self).__init__(code, msg, errcode) | |||
super().__init__(code, msg, errcode) | |||
if additional_fields is None: | |||
self._additional_fields = {} # type: Dict | |||
else: | |||
@@ -181,7 +181,7 @@ class ConsentNotGivenError(SynapseError): | |||
msg: The human-readable error message | |||
consent_url: The URL where the user can give their consent | |||
""" | |||
super(ConsentNotGivenError, self).__init__( | |||
super().__init__( | |||
code=HTTPStatus.FORBIDDEN, msg=msg, errcode=Codes.CONSENT_NOT_GIVEN | |||
) | |||
self._consent_uri = consent_uri | |||
@@ -201,7 +201,7 @@ class UserDeactivatedError(SynapseError): | |||
Args: | |||
msg: The human-readable error message | |||
""" | |||
super(UserDeactivatedError, self).__init__( | |||
super().__init__( | |||
code=HTTPStatus.FORBIDDEN, msg=msg, errcode=Codes.USER_DEACTIVATED | |||
) | |||
@@ -225,7 +225,7 @@ class FederationDeniedError(SynapseError): | |||
self.destination = destination | |||
super(FederationDeniedError, self).__init__( | |||
super().__init__( | |||
code=403, | |||
msg="Federation denied with %s." % (self.destination,), | |||
errcode=Codes.FORBIDDEN, | |||
@@ -244,9 +244,7 @@ class InteractiveAuthIncompleteError(Exception): | |||
""" | |||
def __init__(self, session_id: str, result: "JsonDict"): | |||
super(InteractiveAuthIncompleteError, self).__init__( | |||
"Interactive auth not yet complete" | |||
) | |||
super().__init__("Interactive auth not yet complete") | |||
self.session_id = session_id | |||
self.result = result | |||
@@ -261,14 +259,14 @@ class UnrecognizedRequestError(SynapseError): | |||
message = "Unrecognized request" | |||
else: | |||
message = args[0] | |||
super(UnrecognizedRequestError, self).__init__(400, message, **kwargs) | |||
super().__init__(400, message, **kwargs) | |||
class NotFoundError(SynapseError): | |||
"""An error indicating we can't find the thing you asked for""" | |||
def __init__(self, msg: str = "Not found", errcode: str = Codes.NOT_FOUND): | |||
super(NotFoundError, self).__init__(404, msg, errcode=errcode) | |||
super().__init__(404, msg, errcode=errcode) | |||
class AuthError(SynapseError): | |||
@@ -279,7 +277,7 @@ class AuthError(SynapseError): | |||
def __init__(self, *args, **kwargs): | |||
if "errcode" not in kwargs: | |||
kwargs["errcode"] = Codes.FORBIDDEN | |||
super(AuthError, self).__init__(*args, **kwargs) | |||
super().__init__(*args, **kwargs) | |||
class InvalidClientCredentialsError(SynapseError): | |||
@@ -335,7 +333,7 @@ class ResourceLimitError(SynapseError): | |||
): | |||
self.admin_contact = admin_contact | |||
self.limit_type = limit_type | |||
super(ResourceLimitError, self).__init__(code, msg, errcode=errcode) | |||
super().__init__(code, msg, errcode=errcode) | |||
def error_dict(self): | |||
return cs_error( | |||
@@ -352,7 +350,7 @@ class EventSizeError(SynapseError): | |||
def __init__(self, *args, **kwargs): | |||
if "errcode" not in kwargs: | |||
kwargs["errcode"] = Codes.TOO_LARGE | |||
super(EventSizeError, self).__init__(413, *args, **kwargs) | |||
super().__init__(413, *args, **kwargs) | |||
class EventStreamError(SynapseError): | |||
@@ -361,7 +359,7 @@ class EventStreamError(SynapseError): | |||
def __init__(self, *args, **kwargs): | |||
if "errcode" not in kwargs: | |||
kwargs["errcode"] = Codes.BAD_PAGINATION | |||
super(EventStreamError, self).__init__(*args, **kwargs) | |||
super().__init__(*args, **kwargs) | |||
class LoginError(SynapseError): | |||
@@ -384,7 +382,7 @@ class InvalidCaptchaError(SynapseError): | |||
error_url: Optional[str] = None, | |||
errcode: str = Codes.CAPTCHA_INVALID, | |||
): | |||
super(InvalidCaptchaError, self).__init__(code, msg, errcode) | |||
super().__init__(code, msg, errcode) | |||
self.error_url = error_url | |||
def error_dict(self): | |||
@@ -402,7 +400,7 @@ class LimitExceededError(SynapseError): | |||
retry_after_ms: Optional[int] = None, | |||
errcode: str = Codes.LIMIT_EXCEEDED, | |||
): | |||
super(LimitExceededError, self).__init__(code, msg, errcode) | |||
super().__init__(code, msg, errcode) | |||
self.retry_after_ms = retry_after_ms | |||
def error_dict(self): | |||
@@ -418,9 +416,7 @@ class RoomKeysVersionError(SynapseError): | |||
Args: | |||
current_version: the current version of the store they should have used | |||
""" | |||
super(RoomKeysVersionError, self).__init__( | |||
403, "Wrong room_keys version", Codes.WRONG_ROOM_KEYS_VERSION | |||
) | |||
super().__init__(403, "Wrong room_keys version", Codes.WRONG_ROOM_KEYS_VERSION) | |||
self.current_version = current_version | |||
@@ -429,7 +425,7 @@ class UnsupportedRoomVersionError(SynapseError): | |||
not support.""" | |||
def __init__(self, msg: str = "Homeserver does not support this room version"): | |||
super(UnsupportedRoomVersionError, self).__init__( | |||
super().__init__( | |||
code=400, msg=msg, errcode=Codes.UNSUPPORTED_ROOM_VERSION, | |||
) | |||
@@ -440,7 +436,7 @@ class ThreepidValidationError(SynapseError): | |||
def __init__(self, *args, **kwargs): | |||
if "errcode" not in kwargs: | |||
kwargs["errcode"] = Codes.FORBIDDEN | |||
super(ThreepidValidationError, self).__init__(*args, **kwargs) | |||
super().__init__(*args, **kwargs) | |||
class IncompatibleRoomVersionError(SynapseError): | |||
@@ -451,7 +447,7 @@ class IncompatibleRoomVersionError(SynapseError): | |||
""" | |||
def __init__(self, room_version: str): | |||
super(IncompatibleRoomVersionError, self).__init__( | |||
super().__init__( | |||
code=400, | |||
msg="Your homeserver does not support the features required to " | |||
"join this room", | |||
@@ -473,7 +469,7 @@ class PasswordRefusedError(SynapseError): | |||
msg: str = "This password doesn't comply with the server's policy", | |||
errcode: str = Codes.WEAK_PASSWORD, | |||
): | |||
super(PasswordRefusedError, self).__init__( | |||
super().__init__( | |||
code=400, msg=msg, errcode=errcode, | |||
) | |||
@@ -488,7 +484,7 @@ class RequestSendFailed(RuntimeError): | |||
""" | |||
def __init__(self, inner_exception, can_retry): | |||
super(RequestSendFailed, self).__init__( | |||
super().__init__( | |||
"Failed to send request: %s: %s" | |||
% (type(inner_exception).__name__, inner_exception) | |||
) | |||
@@ -542,7 +538,7 @@ class FederationError(RuntimeError): | |||
self.source = source | |||
msg = "%s %s: %s" % (level, code, reason) | |||
super(FederationError, self).__init__(msg) | |||
super().__init__(msg) | |||
def get_dict(self): | |||
return { | |||
@@ -570,7 +566,7 @@ class HttpResponseException(CodeMessageException): | |||
msg: reason phrase from HTTP response status line | |||
response: body of response | |||
""" | |||
super(HttpResponseException, self).__init__(code, msg) | |||
super().__init__(code, msg) | |||
self.response = response | |||
def to_synapse_error(self): | |||
@@ -132,7 +132,7 @@ def matrix_user_id_validator(user_id_str): | |||
class Filtering: | |||
def __init__(self, hs): | |||
super(Filtering, self).__init__() | |||
super().__init__() | |||
self.store = hs.get_datastore() | |||
async def get_user_filter(self, user_localpart, filter_id): | |||
@@ -152,7 +152,7 @@ class PresenceStatusStubServlet(RestServlet): | |||
PATTERNS = client_patterns("/presence/(?P<user_id>[^/]*)/status") | |||
def __init__(self, hs): | |||
super(PresenceStatusStubServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
async def on_GET(self, request, user_id): | |||
@@ -176,7 +176,7 @@ class KeyUploadServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(KeyUploadServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.http_client = hs.get_simple_http_client() | |||
@@ -646,7 +646,7 @@ class GenericWorkerServer(HomeServer): | |||
class GenericWorkerReplicationHandler(ReplicationDataHandler): | |||
def __init__(self, hs): | |||
super(GenericWorkerReplicationHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.store = hs.get_datastore() | |||
self.presence_handler = hs.get_presence_handler() # type: GenericWorkerPresence | |||
@@ -88,7 +88,7 @@ class ApplicationServiceApi(SimpleHttpClient): | |||
""" | |||
def __init__(self, hs): | |||
super(ApplicationServiceApi, self).__init__(hs) | |||
super().__init__(hs) | |||
self.clock = hs.get_clock() | |||
self.protocol_meta_cache = ResponseCache( | |||
@@ -77,7 +77,7 @@ class ConsentConfig(Config): | |||
section = "consent" | |||
def __init__(self, *args): | |||
super(ConsentConfig, self).__init__(*args) | |||
super().__init__(*args) | |||
self.user_consent_version = None | |||
self.user_consent_template_dir = None | |||
@@ -30,7 +30,7 @@ class AccountValidityConfig(Config): | |||
def __init__(self, config, synapse_config): | |||
if config is None: | |||
return | |||
super(AccountValidityConfig, self).__init__() | |||
super().__init__() | |||
self.enabled = config.get("enabled", False) | |||
self.renew_by_email_enabled = "renew_at" in config | |||
@@ -62,7 +62,7 @@ class ServerNoticesConfig(Config): | |||
section = "servernotices" | |||
def __init__(self, *args): | |||
super(ServerNoticesConfig, self).__init__(*args) | |||
super().__init__(*args) | |||
self.server_notices_mxid = None | |||
self.server_notices_mxid_display_name = None | |||
self.server_notices_mxid_avatar_url = None | |||
@@ -558,7 +558,7 @@ class PerspectivesKeyFetcher(BaseV2KeyFetcher): | |||
"""KeyFetcher impl which fetches keys from the "perspectives" servers""" | |||
def __init__(self, hs): | |||
super(PerspectivesKeyFetcher, self).__init__(hs) | |||
super().__init__(hs) | |||
self.clock = hs.get_clock() | |||
self.client = hs.get_http_client() | |||
self.key_servers = self.config.key_servers | |||
@@ -728,7 +728,7 @@ class ServerKeyFetcher(BaseV2KeyFetcher): | |||
"""KeyFetcher impl which fetches keys from the origin servers""" | |||
def __init__(self, hs): | |||
super(ServerKeyFetcher, self).__init__(hs) | |||
super().__init__(hs) | |||
self.clock = hs.get_clock() | |||
self.client = hs.get_http_client() | |||
@@ -79,7 +79,7 @@ class InvalidResponseError(RuntimeError): | |||
class FederationClient(FederationBase): | |||
def __init__(self, hs): | |||
super(FederationClient, self).__init__(hs) | |||
super().__init__(hs) | |||
self.pdu_destination_tried = {} | |||
self._clock.looping_call(self._clear_tried_cache, 60 * 1000) | |||
@@ -90,7 +90,7 @@ pdu_process_time = Histogram( | |||
class FederationServer(FederationBase): | |||
def __init__(self, hs): | |||
super(FederationServer, self).__init__(hs) | |||
super().__init__(hs) | |||
self.auth = hs.get_auth() | |||
self.handler = hs.get_handlers().federation_handler | |||
@@ -68,7 +68,7 @@ class TransportLayerServer(JsonResource): | |||
self.clock = hs.get_clock() | |||
self.servlet_groups = servlet_groups | |||
super(TransportLayerServer, self).__init__(hs, canonical_json=False) | |||
super().__init__(hs, canonical_json=False) | |||
self.authenticator = Authenticator(hs) | |||
self.ratelimiter = hs.get_federation_ratelimiter() | |||
@@ -376,9 +376,7 @@ class FederationSendServlet(BaseFederationServlet): | |||
RATELIMIT = False | |||
def __init__(self, handler, server_name, **kwargs): | |||
super(FederationSendServlet, self).__init__( | |||
handler, server_name=server_name, **kwargs | |||
) | |||
super().__init__(handler, server_name=server_name, **kwargs) | |||
self.server_name = server_name | |||
# This is when someone is trying to send us a bunch of data. | |||
@@ -773,9 +771,7 @@ class PublicRoomList(BaseFederationServlet): | |||
PATH = "/publicRooms" | |||
def __init__(self, handler, authenticator, ratelimiter, server_name, allow_access): | |||
super(PublicRoomList, self).__init__( | |||
handler, authenticator, ratelimiter, server_name | |||
) | |||
super().__init__(handler, authenticator, ratelimiter, server_name) | |||
self.allow_access = allow_access | |||
async def on_GET(self, origin, content, query): | |||
@@ -336,7 +336,7 @@ class GroupsServerWorkerHandler: | |||
class GroupsServerHandler(GroupsServerWorkerHandler): | |||
def __init__(self, hs): | |||
super(GroupsServerHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
# Ensure attestations get renewed | |||
hs.get_groups_attestation_renewer() | |||
@@ -28,7 +28,7 @@ logger = logging.getLogger(__name__) | |||
class AdminHandler(BaseHandler): | |||
def __init__(self, hs): | |||
super(AdminHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.storage = hs.get_storage() | |||
self.state_store = self.storage.state | |||
@@ -145,7 +145,7 @@ class AuthHandler(BaseHandler): | |||
Args: | |||
hs (synapse.server.HomeServer): | |||
""" | |||
super(AuthHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.checkers = {} # type: Dict[str, UserInteractiveAuthChecker] | |||
for auth_checker_class in INTERACTIVE_AUTH_CHECKERS: | |||
@@ -29,7 +29,7 @@ class DeactivateAccountHandler(BaseHandler): | |||
"""Handler which deals with deactivating user accounts.""" | |||
def __init__(self, hs): | |||
super(DeactivateAccountHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.hs = hs | |||
self._auth_handler = hs.get_auth_handler() | |||
self._device_handler = hs.get_device_handler() | |||
@@ -48,7 +48,7 @@ MAX_DEVICE_DISPLAY_NAME_LEN = 100 | |||
class DeviceWorkerHandler(BaseHandler): | |||
def __init__(self, hs): | |||
super(DeviceWorkerHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.hs = hs | |||
self.state = hs.get_state_handler() | |||
@@ -251,7 +251,7 @@ class DeviceWorkerHandler(BaseHandler): | |||
class DeviceHandler(DeviceWorkerHandler): | |||
def __init__(self, hs): | |||
super(DeviceHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.federation_sender = hs.get_federation_sender() | |||
@@ -37,7 +37,7 @@ logger = logging.getLogger(__name__) | |||
class DirectoryHandler(BaseHandler): | |||
def __init__(self, hs): | |||
super(DirectoryHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.state = hs.get_state_handler() | |||
self.appservice_handler = hs.get_application_service_handler() | |||
@@ -37,7 +37,7 @@ logger = logging.getLogger(__name__) | |||
class EventStreamHandler(BaseHandler): | |||
def __init__(self, hs: "HomeServer"): | |||
super(EventStreamHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.clock = hs.get_clock() | |||
@@ -142,7 +142,7 @@ class EventStreamHandler(BaseHandler): | |||
class EventHandler(BaseHandler): | |||
def __init__(self, hs: "HomeServer"): | |||
super(EventHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.storage = hs.get_storage() | |||
async def get_event( | |||
@@ -115,7 +115,7 @@ class FederationHandler(BaseHandler): | |||
""" | |||
def __init__(self, hs): | |||
super(FederationHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.hs = hs | |||
@@ -240,7 +240,7 @@ class GroupsLocalWorkerHandler: | |||
class GroupsLocalHandler(GroupsLocalWorkerHandler): | |||
def __init__(self, hs): | |||
super(GroupsLocalHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
# Ensure attestations get renewed | |||
hs.get_groups_attestation_renewer() | |||
@@ -45,7 +45,7 @@ id_server_scheme = "https://" | |||
class IdentityHandler(BaseHandler): | |||
def __init__(self, hs): | |||
super(IdentityHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.http_client = SimpleHttpClient(hs) | |||
# We create a blacklisting instance of SimpleHttpClient for contacting identity | |||
@@ -42,7 +42,7 @@ logger = logging.getLogger(__name__) | |||
class InitialSyncHandler(BaseHandler): | |||
def __init__(self, hs: "HomeServer"): | |||
super(InitialSyncHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.hs = hs | |||
self.state = hs.get_state_handler() | |||
self.clock = hs.get_clock() | |||
@@ -44,7 +44,7 @@ class BaseProfileHandler(BaseHandler): | |||
""" | |||
def __init__(self, hs): | |||
super(BaseProfileHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.federation = hs.get_federation_client() | |||
hs.get_federation_registry().register_query_handler( | |||
@@ -369,7 +369,7 @@ class MasterProfileHandler(BaseProfileHandler): | |||
PROFILE_UPDATE_EVERY_MS = 24 * 60 * 60 * 1000 | |||
def __init__(self, hs): | |||
super(MasterProfileHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
assert hs.config.worker_app is None | |||
@@ -24,7 +24,7 @@ logger = logging.getLogger(__name__) | |||
class ReadMarkerHandler(BaseHandler): | |||
def __init__(self, hs): | |||
super(ReadMarkerHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.server_name = hs.config.server_name | |||
self.store = hs.get_datastore() | |||
self.read_marker_linearizer = Linearizer(name="read_marker") | |||
@@ -23,7 +23,7 @@ logger = logging.getLogger(__name__) | |||
class ReceiptsHandler(BaseHandler): | |||
def __init__(self, hs): | |||
super(ReceiptsHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.server_name = hs.config.server_name | |||
self.store = hs.get_datastore() | |||
@@ -42,7 +42,7 @@ class RegistrationHandler(BaseHandler): | |||
Args: | |||
hs (synapse.server.HomeServer): | |||
""" | |||
super(RegistrationHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self._auth_handler = hs.get_auth_handler() | |||
@@ -70,7 +70,7 @@ FIVE_MINUTES_IN_MS = 5 * 60 * 1000 | |||
class RoomCreationHandler(BaseHandler): | |||
def __init__(self, hs: "HomeServer"): | |||
super(RoomCreationHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.spam_checker = hs.get_spam_checker() | |||
self.event_creation_handler = hs.get_event_creation_handler() | |||
@@ -38,7 +38,7 @@ EMPTY_THIRD_PARTY_ID = ThirdPartyInstanceID(None, None) | |||
class RoomListHandler(BaseHandler): | |||
def __init__(self, hs): | |||
super(RoomListHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.enable_room_list_search = hs.config.enable_room_list_search | |||
self.response_cache = ResponseCache(hs, "room_list") | |||
self.remote_response_cache = ResponseCache( | |||
@@ -30,7 +30,7 @@ logger = logging.getLogger(__name__) | |||
class RoomMemberWorkerHandler(RoomMemberHandler): | |||
def __init__(self, hs): | |||
super(RoomMemberWorkerHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self._remote_join_client = ReplRemoteJoin.make_client(hs) | |||
self._remote_reject_client = ReplRejectInvite.make_client(hs) | |||
@@ -32,7 +32,7 @@ logger = logging.getLogger(__name__) | |||
class SearchHandler(BaseHandler): | |||
def __init__(self, hs): | |||
super(SearchHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self._event_serializer = hs.get_event_client_serializer() | |||
self.storage = hs.get_storage() | |||
self.state_store = self.storage.state | |||
@@ -27,7 +27,7 @@ class SetPasswordHandler(BaseHandler): | |||
"""Handler which deals with changing user account passwords""" | |||
def __init__(self, hs): | |||
super(SetPasswordHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self._auth_handler = hs.get_auth_handler() | |||
self._device_handler = hs.get_device_handler() | |||
self._password_policy_handler = hs.get_password_policy_handler() | |||
@@ -37,7 +37,7 @@ class UserDirectoryHandler(StateDeltasHandler): | |||
""" | |||
def __init__(self, hs): | |||
super(UserDirectoryHandler, self).__init__(hs) | |||
super().__init__(hs) | |||
self.store = hs.get_datastore() | |||
self.state = hs.get_state_handler() | |||
@@ -27,7 +27,7 @@ class RequestTimedOutError(SynapseError): | |||
"""Exception representing timeout of an outbound request""" | |||
def __init__(self): | |||
super(RequestTimedOutError, self).__init__(504, "Timed out") | |||
super().__init__(504, "Timed out") | |||
def cancelled_to_request_timed_out_error(value, timeout): | |||
@@ -30,7 +30,7 @@ class LogFormatter(logging.Formatter): | |||
""" | |||
def __init__(self, *args, **kwargs): | |||
super(LogFormatter, self).__init__(*args, **kwargs) | |||
super().__init__(*args, **kwargs) | |||
def formatException(self, ei): | |||
sio = StringIO() | |||
@@ -107,7 +107,7 @@ class _LogContextScope(Scope): | |||
finish_on_close (Boolean): | |||
if True finish the span when the scope is closed | |||
""" | |||
super(_LogContextScope, self).__init__(manager, span) | |||
super().__init__(manager, span) | |||
self.logcontext = logcontext | |||
self._finish_on_close = finish_on_close | |||
self._enter_logcontext = enter_logcontext | |||
@@ -120,9 +120,9 @@ class _LogContextScope(Scope): | |||
def __exit__(self, type, value, traceback): | |||
if type == twisted.internet.defer._DefGen_Return: | |||
super(_LogContextScope, self).__exit__(None, None, None) | |||
super().__exit__(None, None, None) | |||
else: | |||
super(_LogContextScope, self).__exit__(type, value, traceback) | |||
super().__exit__(type, value, traceback) | |||
if self._enter_logcontext: | |||
self.logcontext.__exit__(type, value, traceback) | |||
else: # the logcontext existed before the creation of the scope | |||
@@ -16,4 +16,4 @@ | |||
class PusherConfigException(Exception): | |||
def __init__(self, msg): | |||
super(PusherConfigException, self).__init__(msg) | |||
super().__init__(msg) |
@@ -53,7 +53,7 @@ class ReplicationUserDevicesResyncRestServlet(ReplicationEndpoint): | |||
CACHE = False | |||
def __init__(self, hs): | |||
super(ReplicationUserDevicesResyncRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.device_list_updater = hs.get_device_handler().device_list_updater | |||
self.store = hs.get_datastore() | |||
@@ -57,7 +57,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): | |||
PATH_ARGS = () | |||
def __init__(self, hs): | |||
super(ReplicationFederationSendEventsRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.store = hs.get_datastore() | |||
self.storage = hs.get_storage() | |||
@@ -150,7 +150,7 @@ class ReplicationFederationSendEduRestServlet(ReplicationEndpoint): | |||
PATH_ARGS = ("edu_type",) | |||
def __init__(self, hs): | |||
super(ReplicationFederationSendEduRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.store = hs.get_datastore() | |||
self.clock = hs.get_clock() | |||
@@ -193,7 +193,7 @@ class ReplicationGetQueryRestServlet(ReplicationEndpoint): | |||
CACHE = False | |||
def __init__(self, hs): | |||
super(ReplicationGetQueryRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.store = hs.get_datastore() | |||
self.clock = hs.get_clock() | |||
@@ -236,7 +236,7 @@ class ReplicationCleanRoomRestServlet(ReplicationEndpoint): | |||
PATH_ARGS = ("room_id",) | |||
def __init__(self, hs): | |||
super(ReplicationCleanRoomRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.store = hs.get_datastore() | |||
@@ -32,7 +32,7 @@ class RegisterDeviceReplicationServlet(ReplicationEndpoint): | |||
PATH_ARGS = ("user_id",) | |||
def __init__(self, hs): | |||
super(RegisterDeviceReplicationServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.registration_handler = hs.get_registration_handler() | |||
@staticmethod | |||
@@ -45,7 +45,7 @@ class ReplicationRemoteJoinRestServlet(ReplicationEndpoint): | |||
PATH_ARGS = ("room_id", "user_id") | |||
def __init__(self, hs): | |||
super(ReplicationRemoteJoinRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.federation_handler = hs.get_handlers().federation_handler | |||
self.store = hs.get_datastore() | |||
@@ -107,7 +107,7 @@ class ReplicationRemoteRejectInviteRestServlet(ReplicationEndpoint): | |||
PATH_ARGS = ("invite_event_id",) | |||
def __init__(self, hs: "HomeServer"): | |||
super(ReplicationRemoteRejectInviteRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.store = hs.get_datastore() | |||
self.clock = hs.get_clock() | |||
@@ -168,7 +168,7 @@ class ReplicationUserJoinedLeftRoomRestServlet(ReplicationEndpoint): | |||
CACHE = False # No point caching as should return instantly. | |||
def __init__(self, hs): | |||
super(ReplicationUserJoinedLeftRoomRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.registeration_handler = hs.get_registration_handler() | |||
self.store = hs.get_datastore() | |||
@@ -29,7 +29,7 @@ class ReplicationRegisterServlet(ReplicationEndpoint): | |||
PATH_ARGS = ("user_id",) | |||
def __init__(self, hs): | |||
super(ReplicationRegisterServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.store = hs.get_datastore() | |||
self.registration_handler = hs.get_registration_handler() | |||
@@ -104,7 +104,7 @@ class ReplicationPostRegisterActionsServlet(ReplicationEndpoint): | |||
PATH_ARGS = ("user_id",) | |||
def __init__(self, hs): | |||
super(ReplicationPostRegisterActionsServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.store = hs.get_datastore() | |||
self.registration_handler = hs.get_registration_handler() | |||
@@ -52,7 +52,7 @@ class ReplicationSendEventRestServlet(ReplicationEndpoint): | |||
PATH_ARGS = ("event_id",) | |||
def __init__(self, hs): | |||
super(ReplicationSendEventRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.event_creation_handler = hs.get_event_creation_handler() | |||
self.store = hs.get_datastore() | |||
@@ -26,7 +26,7 @@ logger = logging.getLogger(__name__) | |||
class BaseSlavedStore(CacheInvalidationWorkerStore): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(BaseSlavedStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
if isinstance(self.database_engine, PostgresEngine): | |||
self._cache_id_gen = MultiWriterIdGenerator( | |||
db_conn, | |||
@@ -34,7 +34,7 @@ class SlavedAccountDataStore(TagsWorkerStore, AccountDataWorkerStore, BaseSlaved | |||
], | |||
) | |||
super(SlavedAccountDataStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
def get_max_account_data_stream_id(self): | |||
return self._account_data_id_gen.get_current_token() | |||
@@ -22,7 +22,7 @@ from ._base import BaseSlavedStore | |||
class SlavedClientIpStore(BaseSlavedStore): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(SlavedClientIpStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
self.client_ip_last_seen = Cache( | |||
name="client_ip_last_seen", keylen=4, max_entries=50000 | |||
@@ -24,7 +24,7 @@ from synapse.util.caches.stream_change_cache import StreamChangeCache | |||
class SlavedDeviceInboxStore(DeviceInboxWorkerStore, BaseSlavedStore): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(SlavedDeviceInboxStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
self._device_inbox_id_gen = SlavedIdTracker( | |||
db_conn, "device_inbox", "stream_id" | |||
) | |||
@@ -24,7 +24,7 @@ from synapse.util.caches.stream_change_cache import StreamChangeCache | |||
class SlavedDeviceStore(EndToEndKeyWorkerStore, DeviceWorkerStore, BaseSlavedStore): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(SlavedDeviceStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
self.hs = hs | |||
@@ -56,7 +56,7 @@ class SlavedEventStore( | |||
BaseSlavedStore, | |||
): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(SlavedEventStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
events_max = self._stream_id_gen.get_current_token() | |||
curr_state_delta_prefill, min_curr_state_delta_id = self.db_pool.get_cache_dict( | |||
@@ -21,7 +21,7 @@ from ._base import BaseSlavedStore | |||
class SlavedFilteringStore(BaseSlavedStore): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(SlavedFilteringStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
# Filters are immutable so this cache doesn't need to be expired | |||
get_user_filter = FilteringStore.__dict__["get_user_filter"] |
@@ -23,7 +23,7 @@ from synapse.util.caches.stream_change_cache import StreamChangeCache | |||
class SlavedGroupServerStore(GroupServerWorkerStore, BaseSlavedStore): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(SlavedGroupServerStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
self.hs = hs | |||
@@ -25,7 +25,7 @@ from ._slaved_id_tracker import SlavedIdTracker | |||
class SlavedPresenceStore(BaseSlavedStore): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(SlavedPresenceStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
self._presence_id_gen = SlavedIdTracker(db_conn, "presence_stream", "stream_id") | |||
self._presence_on_startup = self._get_active_presence(db_conn) # type: ignore | |||
@@ -24,7 +24,7 @@ from ._slaved_id_tracker import SlavedIdTracker | |||
class SlavedPusherStore(PusherWorkerStore, BaseSlavedStore): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(SlavedPusherStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
self._pushers_id_gen = SlavedIdTracker( | |||
db_conn, "pushers", "id", extra_tables=[("deleted_pushers", "stream_id")] | |||
) | |||
@@ -30,7 +30,7 @@ class SlavedReceiptsStore(ReceiptsWorkerStore, BaseSlavedStore): | |||
db_conn, "receipts_linearized", "stream_id" | |||
) | |||
super(SlavedReceiptsStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
def get_max_receipt_stream_id(self): | |||
return self._receipts_id_gen.get_current_token() | |||
@@ -23,7 +23,7 @@ from ._slaved_id_tracker import SlavedIdTracker | |||
class RoomStore(RoomWorkerStore, BaseSlavedStore): | |||
def __init__(self, database: DatabasePool, db_conn, hs): | |||
super(RoomStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
self._public_room_id_gen = SlavedIdTracker( | |||
db_conn, "public_room_list_stream", "stream_id" | |||
) | |||
@@ -345,7 +345,7 @@ class PushRulesStream(Stream): | |||
def __init__(self, hs): | |||
self.store = hs.get_datastore() | |||
super(PushRulesStream, self).__init__( | |||
super().__init__( | |||
hs.get_instance_name(), | |||
self._current_token, | |||
self.store.get_all_push_rule_updates, | |||
@@ -36,7 +36,7 @@ class DeviceRestServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(DeviceRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.device_handler = hs.get_device_handler() | |||
@@ -40,7 +40,7 @@ class ClientDirectoryServer(RestServlet): | |||
PATTERNS = client_patterns("/directory/room/(?P<room_alias>[^/]*)$", v1=True) | |||
def __init__(self, hs): | |||
super(ClientDirectoryServer, self).__init__() | |||
super().__init__() | |||
self.store = hs.get_datastore() | |||
self.handlers = hs.get_handlers() | |||
self.auth = hs.get_auth() | |||
@@ -120,7 +120,7 @@ class ClientDirectoryListServer(RestServlet): | |||
PATTERNS = client_patterns("/directory/list/room/(?P<room_id>[^/]*)$", v1=True) | |||
def __init__(self, hs): | |||
super(ClientDirectoryListServer, self).__init__() | |||
super().__init__() | |||
self.store = hs.get_datastore() | |||
self.handlers = hs.get_handlers() | |||
self.auth = hs.get_auth() | |||
@@ -160,7 +160,7 @@ class ClientAppserviceDirectoryListServer(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(ClientAppserviceDirectoryListServer, self).__init__() | |||
super().__init__() | |||
self.store = hs.get_datastore() | |||
self.handlers = hs.get_handlers() | |||
self.auth = hs.get_auth() | |||
@@ -30,7 +30,7 @@ class EventStreamRestServlet(RestServlet): | |||
DEFAULT_LONGPOLL_TIME_MS = 30000 | |||
def __init__(self, hs): | |||
super(EventStreamRestServlet, self).__init__() | |||
super().__init__() | |||
self.event_stream_handler = hs.get_event_stream_handler() | |||
self.auth = hs.get_auth() | |||
@@ -74,7 +74,7 @@ class EventRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/events/(?P<event_id>[^/]*)$", v1=True) | |||
def __init__(self, hs): | |||
super(EventRestServlet, self).__init__() | |||
super().__init__() | |||
self.clock = hs.get_clock() | |||
self.event_handler = hs.get_event_handler() | |||
self.auth = hs.get_auth() | |||
@@ -24,7 +24,7 @@ class InitialSyncRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/initialSync$", v1=True) | |||
def __init__(self, hs): | |||
super(InitialSyncRestServlet, self).__init__() | |||
super().__init__() | |||
self.initial_sync_handler = hs.get_initial_sync_handler() | |||
self.auth = hs.get_auth() | |||
@@ -48,7 +48,7 @@ class LoginRestServlet(RestServlet): | |||
APPSERVICE_TYPE = "uk.half-shot.msc2778.login.application_service" | |||
def __init__(self, hs): | |||
super(LoginRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
# JWT configuration variables. | |||
@@ -429,7 +429,7 @@ class CasTicketServlet(RestServlet): | |||
PATTERNS = client_patterns("/login/cas/ticket", v1=True) | |||
def __init__(self, hs): | |||
super(CasTicketServlet, self).__init__() | |||
super().__init__() | |||
self._cas_handler = hs.get_cas_handler() | |||
async def on_GET(self, request: SynapseRequest) -> None: | |||
@@ -25,7 +25,7 @@ class LogoutRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/logout$", v1=True) | |||
def __init__(self, hs): | |||
super(LogoutRestServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self._auth_handler = hs.get_auth_handler() | |||
self._device_handler = hs.get_device_handler() | |||
@@ -53,7 +53,7 @@ class LogoutAllRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/logout/all$", v1=True) | |||
def __init__(self, hs): | |||
super(LogoutAllRestServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self._auth_handler = hs.get_auth_handler() | |||
self._device_handler = hs.get_device_handler() | |||
@@ -30,7 +30,7 @@ class PresenceStatusRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/presence/(?P<user_id>[^/]*)/status", v1=True) | |||
def __init__(self, hs): | |||
super(PresenceStatusRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.presence_handler = hs.get_presence_handler() | |||
self.clock = hs.get_clock() | |||
@@ -25,7 +25,7 @@ class ProfileDisplaynameRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/profile/(?P<user_id>[^/]*)/displayname", v1=True) | |||
def __init__(self, hs): | |||
super(ProfileDisplaynameRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.profile_handler = hs.get_profile_handler() | |||
self.auth = hs.get_auth() | |||
@@ -73,7 +73,7 @@ class ProfileAvatarURLRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/profile/(?P<user_id>[^/]*)/avatar_url", v1=True) | |||
def __init__(self, hs): | |||
super(ProfileAvatarURLRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.profile_handler = hs.get_profile_handler() | |||
self.auth = hs.get_auth() | |||
@@ -124,7 +124,7 @@ class ProfileRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/profile/(?P<user_id>[^/]*)", v1=True) | |||
def __init__(self, hs): | |||
super(ProfileRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.profile_handler = hs.get_profile_handler() | |||
self.auth = hs.get_auth() | |||
@@ -38,7 +38,7 @@ class PushRuleRestServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(PushRuleRestServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.notifier = hs.get_notifier() | |||
@@ -44,7 +44,7 @@ class PushersRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/pushers$", v1=True) | |||
def __init__(self, hs): | |||
super(PushersRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
@@ -68,7 +68,7 @@ class PushersSetRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/pushers/set$", v1=True) | |||
def __init__(self, hs): | |||
super(PushersSetRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.notifier = hs.get_notifier() | |||
@@ -153,7 +153,7 @@ class PushersRemoveRestServlet(RestServlet): | |||
SUCCESS_HTML = b"<html><body>You have been unsubscribed</body><html>" | |||
def __init__(self, hs): | |||
super(PushersRemoveRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.notifier = hs.get_notifier() | |||
self.auth = hs.get_auth() | |||
@@ -57,7 +57,7 @@ logger = logging.getLogger(__name__) | |||
class TransactionRestServlet(RestServlet): | |||
def __init__(self, hs): | |||
super(TransactionRestServlet, self).__init__() | |||
super().__init__() | |||
self.txns = HttpTransactionCache(hs) | |||
@@ -65,7 +65,7 @@ class RoomCreateRestServlet(TransactionRestServlet): | |||
# No PATTERN; we have custom dispatch rules here | |||
def __init__(self, hs): | |||
super(RoomCreateRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self._room_creation_handler = hs.get_room_creation_handler() | |||
self.auth = hs.get_auth() | |||
@@ -111,7 +111,7 @@ class RoomCreateRestServlet(TransactionRestServlet): | |||
# TODO: Needs unit testing for generic events | |||
class RoomStateEventRestServlet(TransactionRestServlet): | |||
def __init__(self, hs): | |||
super(RoomStateEventRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.handlers = hs.get_handlers() | |||
self.event_creation_handler = hs.get_event_creation_handler() | |||
self.room_member_handler = hs.get_room_member_handler() | |||
@@ -229,7 +229,7 @@ class RoomStateEventRestServlet(TransactionRestServlet): | |||
# TODO: Needs unit testing for generic events + feedback | |||
class RoomSendEventRestServlet(TransactionRestServlet): | |||
def __init__(self, hs): | |||
super(RoomSendEventRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.event_creation_handler = hs.get_event_creation_handler() | |||
self.auth = hs.get_auth() | |||
@@ -280,7 +280,7 @@ class RoomSendEventRestServlet(TransactionRestServlet): | |||
# TODO: Needs unit testing for room ID + alias joins | |||
class JoinRoomAliasServlet(TransactionRestServlet): | |||
def __init__(self, hs): | |||
super(JoinRoomAliasServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.room_member_handler = hs.get_room_member_handler() | |||
self.auth = hs.get_auth() | |||
@@ -343,7 +343,7 @@ class PublicRoomListRestServlet(TransactionRestServlet): | |||
PATTERNS = client_patterns("/publicRooms$", v1=True) | |||
def __init__(self, hs): | |||
super(PublicRoomListRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
@@ -448,7 +448,7 @@ class RoomMemberListRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/rooms/(?P<room_id>[^/]*)/members$", v1=True) | |||
def __init__(self, hs): | |||
super(RoomMemberListRestServlet, self).__init__() | |||
super().__init__() | |||
self.message_handler = hs.get_message_handler() | |||
self.auth = hs.get_auth() | |||
@@ -499,7 +499,7 @@ class JoinedRoomMemberListRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/rooms/(?P<room_id>[^/]*)/joined_members$", v1=True) | |||
def __init__(self, hs): | |||
super(JoinedRoomMemberListRestServlet, self).__init__() | |||
super().__init__() | |||
self.message_handler = hs.get_message_handler() | |||
self.auth = hs.get_auth() | |||
@@ -518,7 +518,7 @@ class RoomMessageListRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/rooms/(?P<room_id>[^/]*)/messages$", v1=True) | |||
def __init__(self, hs): | |||
super(RoomMessageListRestServlet, self).__init__() | |||
super().__init__() | |||
self.pagination_handler = hs.get_pagination_handler() | |||
self.auth = hs.get_auth() | |||
@@ -557,7 +557,7 @@ class RoomStateRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/rooms/(?P<room_id>[^/]*)/state$", v1=True) | |||
def __init__(self, hs): | |||
super(RoomStateRestServlet, self).__init__() | |||
super().__init__() | |||
self.message_handler = hs.get_message_handler() | |||
self.auth = hs.get_auth() | |||
@@ -577,7 +577,7 @@ class RoomInitialSyncRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/rooms/(?P<room_id>[^/]*)/initialSync$", v1=True) | |||
def __init__(self, hs): | |||
super(RoomInitialSyncRestServlet, self).__init__() | |||
super().__init__() | |||
self.initial_sync_handler = hs.get_initial_sync_handler() | |||
self.auth = hs.get_auth() | |||
@@ -596,7 +596,7 @@ class RoomEventServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(RoomEventServlet, self).__init__() | |||
super().__init__() | |||
self.clock = hs.get_clock() | |||
self.event_handler = hs.get_event_handler() | |||
self._event_serializer = hs.get_event_client_serializer() | |||
@@ -628,7 +628,7 @@ class RoomEventContextServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(RoomEventContextServlet, self).__init__() | |||
super().__init__() | |||
self.clock = hs.get_clock() | |||
self.room_context_handler = hs.get_room_context_handler() | |||
self._event_serializer = hs.get_event_client_serializer() | |||
@@ -675,7 +675,7 @@ class RoomEventContextServlet(RestServlet): | |||
class RoomForgetRestServlet(TransactionRestServlet): | |||
def __init__(self, hs): | |||
super(RoomForgetRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.room_member_handler = hs.get_room_member_handler() | |||
self.auth = hs.get_auth() | |||
@@ -701,7 +701,7 @@ class RoomForgetRestServlet(TransactionRestServlet): | |||
# TODO: Needs unit testing | |||
class RoomMembershipRestServlet(TransactionRestServlet): | |||
def __init__(self, hs): | |||
super(RoomMembershipRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.room_member_handler = hs.get_room_member_handler() | |||
self.auth = hs.get_auth() | |||
@@ -792,7 +792,7 @@ class RoomMembershipRestServlet(TransactionRestServlet): | |||
class RoomRedactEventRestServlet(TransactionRestServlet): | |||
def __init__(self, hs): | |||
super(RoomRedactEventRestServlet, self).__init__(hs) | |||
super().__init__(hs) | |||
self.handlers = hs.get_handlers() | |||
self.event_creation_handler = hs.get_event_creation_handler() | |||
self.auth = hs.get_auth() | |||
@@ -841,7 +841,7 @@ class RoomTypingRestServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(RoomTypingRestServlet, self).__init__() | |||
super().__init__() | |||
self.presence_handler = hs.get_presence_handler() | |||
self.typing_handler = hs.get_typing_handler() | |||
self.auth = hs.get_auth() | |||
@@ -914,7 +914,7 @@ class SearchRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/search$", v1=True) | |||
def __init__(self, hs): | |||
super(SearchRestServlet, self).__init__() | |||
super().__init__() | |||
self.handlers = hs.get_handlers() | |||
self.auth = hs.get_auth() | |||
@@ -935,7 +935,7 @@ class JoinedRoomsRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/joined_rooms$", v1=True) | |||
def __init__(self, hs): | |||
super(JoinedRoomsRestServlet, self).__init__() | |||
super().__init__() | |||
self.store = hs.get_datastore() | |||
self.auth = hs.get_auth() | |||
@@ -25,7 +25,7 @@ class VoipRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/voip/turnServer$", v1=True) | |||
def __init__(self, hs): | |||
super(VoipRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
@@ -52,7 +52,7 @@ class EmailPasswordRequestTokenRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/password/email/requestToken$") | |||
def __init__(self, hs): | |||
super(EmailPasswordRequestTokenRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.datastore = hs.get_datastore() | |||
self.config = hs.config | |||
@@ -156,7 +156,7 @@ class PasswordRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/password$") | |||
def __init__(self, hs): | |||
super(PasswordRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.auth_handler = hs.get_auth_handler() | |||
@@ -282,7 +282,7 @@ class DeactivateAccountRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/deactivate$") | |||
def __init__(self, hs): | |||
super(DeactivateAccountRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.auth_handler = hs.get_auth_handler() | |||
@@ -330,7 +330,7 @@ class EmailThreepidRequestTokenRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/3pid/email/requestToken$") | |||
def __init__(self, hs): | |||
super(EmailThreepidRequestTokenRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.config = hs.config | |||
self.identity_handler = hs.get_handlers().identity_handler | |||
@@ -427,7 +427,7 @@ class MsisdnThreepidRequestTokenRestServlet(RestServlet): | |||
def __init__(self, hs): | |||
self.hs = hs | |||
super(MsisdnThreepidRequestTokenRestServlet, self).__init__() | |||
super().__init__() | |||
self.store = self.hs.get_datastore() | |||
self.identity_handler = hs.get_handlers().identity_handler | |||
@@ -606,7 +606,7 @@ class ThreepidRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/3pid$") | |||
def __init__(self, hs): | |||
super(ThreepidRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.identity_handler = hs.get_handlers().identity_handler | |||
self.auth = hs.get_auth() | |||
@@ -662,7 +662,7 @@ class ThreepidAddRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/3pid/add$") | |||
def __init__(self, hs): | |||
super(ThreepidAddRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.identity_handler = hs.get_handlers().identity_handler | |||
self.auth = hs.get_auth() | |||
@@ -713,7 +713,7 @@ class ThreepidBindRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/3pid/bind$") | |||
def __init__(self, hs): | |||
super(ThreepidBindRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.identity_handler = hs.get_handlers().identity_handler | |||
self.auth = hs.get_auth() | |||
@@ -742,7 +742,7 @@ class ThreepidUnbindRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/3pid/unbind$") | |||
def __init__(self, hs): | |||
super(ThreepidUnbindRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.identity_handler = hs.get_handlers().identity_handler | |||
self.auth = hs.get_auth() | |||
@@ -773,7 +773,7 @@ class ThreepidDeleteRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/3pid/delete$") | |||
def __init__(self, hs): | |||
super(ThreepidDeleteRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.auth_handler = hs.get_auth_handler() | |||
@@ -852,7 +852,7 @@ class WhoamiRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/account/whoami$") | |||
def __init__(self, hs): | |||
super(WhoamiRestServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
async def on_GET(self, request): | |||
@@ -34,7 +34,7 @@ class AccountDataServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(AccountDataServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.notifier = hs.get_notifier() | |||
@@ -86,7 +86,7 @@ class RoomAccountDataServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(RoomAccountDataServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.notifier = hs.get_notifier() | |||
@@ -32,7 +32,7 @@ class AccountValidityRenewServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(AccountValidityRenewServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.account_activity_handler = hs.get_account_validity_handler() | |||
@@ -67,7 +67,7 @@ class AccountValiditySendMailServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(AccountValiditySendMailServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.account_activity_handler = hs.get_account_validity_handler() | |||
@@ -124,7 +124,7 @@ class AuthRestServlet(RestServlet): | |||
PATTERNS = client_patterns(r"/auth/(?P<stagetype>[\w\.]*)/fallback/web") | |||
def __init__(self, hs): | |||
super(AuthRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.auth_handler = hs.get_auth_handler() | |||
@@ -32,7 +32,7 @@ class CapabilitiesRestServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(CapabilitiesRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.config = hs.config | |||
self.auth = hs.get_auth() | |||
@@ -35,7 +35,7 @@ class DevicesRestServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(DevicesRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.device_handler = hs.get_device_handler() | |||
@@ -57,7 +57,7 @@ class DeleteDevicesRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/delete_devices") | |||
def __init__(self, hs): | |||
super(DeleteDevicesRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.device_handler = hs.get_device_handler() | |||
@@ -102,7 +102,7 @@ class DeviceRestServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(DeviceRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.device_handler = hs.get_device_handler() | |||
@@ -28,7 +28,7 @@ class GetFilterRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/user/(?P<user_id>[^/]*)/filter/(?P<filter_id>[^/]*)") | |||
def __init__(self, hs): | |||
super(GetFilterRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.filtering = hs.get_filtering() | |||
@@ -64,7 +64,7 @@ class CreateFilterRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/user/(?P<user_id>[^/]*)/filter") | |||
def __init__(self, hs): | |||
super(CreateFilterRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.filtering = hs.get_filtering() | |||
@@ -32,7 +32,7 @@ class GroupServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/profile$") | |||
def __init__(self, hs): | |||
super(GroupServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -66,7 +66,7 @@ class GroupSummaryServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/summary$") | |||
def __init__(self, hs): | |||
super(GroupSummaryServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -97,7 +97,7 @@ class GroupSummaryRoomsCatServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(GroupSummaryRoomsCatServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -137,7 +137,7 @@ class GroupCategoryServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(GroupCategoryServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -181,7 +181,7 @@ class GroupCategoriesServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/categories/$") | |||
def __init__(self, hs): | |||
super(GroupCategoriesServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -204,7 +204,7 @@ class GroupRoleServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/roles/(?P<role_id>[^/]+)$") | |||
def __init__(self, hs): | |||
super(GroupRoleServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -248,7 +248,7 @@ class GroupRolesServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/roles/$") | |||
def __init__(self, hs): | |||
super(GroupRolesServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -279,7 +279,7 @@ class GroupSummaryUsersRoleServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(GroupSummaryUsersRoleServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -317,7 +317,7 @@ class GroupRoomServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/rooms$") | |||
def __init__(self, hs): | |||
super(GroupRoomServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -343,7 +343,7 @@ class GroupUsersServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/users$") | |||
def __init__(self, hs): | |||
super(GroupUsersServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -366,7 +366,7 @@ class GroupInvitedUsersServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/invited_users$") | |||
def __init__(self, hs): | |||
super(GroupInvitedUsersServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -389,7 +389,7 @@ class GroupSettingJoinPolicyServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/settings/m.join_policy$") | |||
def __init__(self, hs): | |||
super(GroupSettingJoinPolicyServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -413,7 +413,7 @@ class GroupCreateServlet(RestServlet): | |||
PATTERNS = client_patterns("/create_group$") | |||
def __init__(self, hs): | |||
super(GroupCreateServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -444,7 +444,7 @@ class GroupAdminRoomsServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(GroupAdminRoomsServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -481,7 +481,7 @@ class GroupAdminRoomsConfigServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(GroupAdminRoomsConfigServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -507,7 +507,7 @@ class GroupAdminUsersInviteServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(GroupAdminUsersInviteServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -536,7 +536,7 @@ class GroupAdminUsersKickServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(GroupAdminUsersKickServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -560,7 +560,7 @@ class GroupSelfLeaveServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/self/leave$") | |||
def __init__(self, hs): | |||
super(GroupSelfLeaveServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -584,7 +584,7 @@ class GroupSelfJoinServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/self/join$") | |||
def __init__(self, hs): | |||
super(GroupSelfJoinServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -608,7 +608,7 @@ class GroupSelfAcceptInviteServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/self/accept_invite$") | |||
def __init__(self, hs): | |||
super(GroupSelfAcceptInviteServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -632,7 +632,7 @@ class GroupSelfUpdatePublicityServlet(RestServlet): | |||
PATTERNS = client_patterns("/groups/(?P<group_id>[^/]*)/self/update_publicity$") | |||
def __init__(self, hs): | |||
super(GroupSelfUpdatePublicityServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.store = hs.get_datastore() | |||
@@ -655,7 +655,7 @@ class PublicisedGroupsForUserServlet(RestServlet): | |||
PATTERNS = client_patterns("/publicised_groups/(?P<user_id>[^/]*)$") | |||
def __init__(self, hs): | |||
super(PublicisedGroupsForUserServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.store = hs.get_datastore() | |||
@@ -676,7 +676,7 @@ class PublicisedGroupsForUsersServlet(RestServlet): | |||
PATTERNS = client_patterns("/publicised_groups$") | |||
def __init__(self, hs): | |||
super(PublicisedGroupsForUsersServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.store = hs.get_datastore() | |||
@@ -700,7 +700,7 @@ class GroupsForUserServlet(RestServlet): | |||
PATTERNS = client_patterns("/joined_groups$") | |||
def __init__(self, hs): | |||
super(GroupsForUserServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
self.groups_handler = hs.get_groups_local_handler() | |||
@@ -64,7 +64,7 @@ class KeyUploadServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(KeyUploadServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.e2e_keys_handler = hs.get_e2e_keys_handler() | |||
@@ -147,7 +147,7 @@ class KeyQueryServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): | |||
""" | |||
super(KeyQueryServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.e2e_keys_handler = hs.get_e2e_keys_handler() | |||
@@ -177,7 +177,7 @@ class KeyChangesServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): | |||
""" | |||
super(KeyChangesServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.device_handler = hs.get_device_handler() | |||
@@ -222,7 +222,7 @@ class OneTimeKeyServlet(RestServlet): | |||
PATTERNS = client_patterns("/keys/claim$") | |||
def __init__(self, hs): | |||
super(OneTimeKeyServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.e2e_keys_handler = hs.get_e2e_keys_handler() | |||
@@ -250,7 +250,7 @@ class SigningKeyUploadServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(SigningKeyUploadServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.e2e_keys_handler = hs.get_e2e_keys_handler() | |||
@@ -308,7 +308,7 @@ class SignaturesUploadServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(SignaturesUploadServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.e2e_keys_handler = hs.get_e2e_keys_handler() | |||
@@ -27,7 +27,7 @@ class NotificationsServlet(RestServlet): | |||
PATTERNS = client_patterns("/notifications$") | |||
def __init__(self, hs): | |||
super(NotificationsServlet, self).__init__() | |||
super().__init__() | |||
self.store = hs.get_datastore() | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
@@ -60,7 +60,7 @@ class IdTokenServlet(RestServlet): | |||
EXPIRES_MS = 3600 * 1000 | |||
def __init__(self, hs): | |||
super(IdTokenServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.clock = hs.get_clock() | |||
@@ -30,7 +30,7 @@ class PasswordPolicyServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(PasswordPolicyServlet, self).__init__() | |||
super().__init__() | |||
self.policy = hs.config.password_policy | |||
self.enabled = hs.config.password_policy_enabled | |||
@@ -26,7 +26,7 @@ class ReadMarkerRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/rooms/(?P<room_id>[^/]*)/read_markers$") | |||
def __init__(self, hs): | |||
super(ReadMarkerRestServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.receipts_handler = hs.get_receipts_handler() | |||
self.read_marker_handler = hs.get_read_marker_handler() | |||
@@ -31,7 +31,7 @@ class ReceiptRestServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(ReceiptRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.receipts_handler = hs.get_receipts_handler() | |||
@@ -76,7 +76,7 @@ class EmailRegisterRequestTokenRestServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(EmailRegisterRequestTokenRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.identity_handler = hs.get_handlers().identity_handler | |||
self.config = hs.config | |||
@@ -174,7 +174,7 @@ class MsisdnRegisterRequestTokenRestServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(MsisdnRegisterRequestTokenRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.identity_handler = hs.get_handlers().identity_handler | |||
@@ -249,7 +249,7 @@ class RegistrationSubmitTokenServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(RegistrationSubmitTokenServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.config = hs.config | |||
@@ -319,7 +319,7 @@ class UsernameAvailabilityRestServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(UsernameAvailabilityRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.registration_handler = hs.get_registration_handler() | |||
self.ratelimiter = FederationRateLimiter( | |||
@@ -363,7 +363,7 @@ class RegisterRestServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(RegisterRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
@@ -61,7 +61,7 @@ class RelationSendServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(RelationSendServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.event_creation_handler = hs.get_event_creation_handler() | |||
self.txns = HttpTransactionCache(hs) | |||
@@ -138,7 +138,7 @@ class RelationPaginationServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(RelationPaginationServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.clock = hs.get_clock() | |||
@@ -233,7 +233,7 @@ class RelationAggregationPaginationServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(RelationAggregationPaginationServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.event_handler = hs.get_event_handler() | |||
@@ -311,7 +311,7 @@ class RelationAggregationGroupPaginationServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(RelationAggregationGroupPaginationServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.clock = hs.get_clock() | |||
@@ -32,7 +32,7 @@ class ReportEventRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/rooms/(?P<room_id>[^/]*)/report/(?P<event_id>[^/]*)$") | |||
def __init__(self, hs): | |||
super(ReportEventRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.clock = hs.get_clock() | |||
@@ -37,7 +37,7 @@ class RoomKeysServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(RoomKeysServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.e2e_room_keys_handler = hs.get_e2e_room_keys_handler() | |||
@@ -248,7 +248,7 @@ class RoomKeysNewVersionServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(RoomKeysNewVersionServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.e2e_room_keys_handler = hs.get_e2e_room_keys_handler() | |||
@@ -301,7 +301,7 @@ class RoomKeysVersionServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(RoomKeysVersionServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.e2e_room_keys_handler = hs.get_e2e_room_keys_handler() | |||
@@ -53,7 +53,7 @@ class RoomUpgradeRestServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(RoomUpgradeRestServlet, self).__init__() | |||
super().__init__() | |||
self._hs = hs | |||
self._room_creation_handler = hs.get_room_creation_handler() | |||
self._auth = hs.get_auth() | |||
@@ -36,7 +36,7 @@ class SendToDeviceRestServlet(servlet.RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(SendToDeviceRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.txns = HttpTransactionCache(hs) | |||
@@ -34,7 +34,7 @@ class UserSharedRoomsServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(UserSharedRoomsServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.user_directory_active = hs.config.update_user_directory | |||
@@ -74,7 +74,7 @@ class SyncRestServlet(RestServlet): | |||
ALLOWED_PRESENCE = {"online", "offline", "unavailable"} | |||
def __init__(self, hs): | |||
super(SyncRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.sync_handler = hs.get_sync_handler() | |||
@@ -31,7 +31,7 @@ class TagListServlet(RestServlet): | |||
PATTERNS = client_patterns("/user/(?P<user_id>[^/]*)/rooms/(?P<room_id>[^/]*)/tags") | |||
def __init__(self, hs): | |||
super(TagListServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
@@ -56,7 +56,7 @@ class TagServlet(RestServlet): | |||
) | |||
def __init__(self, hs): | |||
super(TagServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.store = hs.get_datastore() | |||
self.notifier = hs.get_notifier() | |||
@@ -28,7 +28,7 @@ class ThirdPartyProtocolsServlet(RestServlet): | |||
PATTERNS = client_patterns("/thirdparty/protocols") | |||
def __init__(self, hs): | |||
super(ThirdPartyProtocolsServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.appservice_handler = hs.get_application_service_handler() | |||
@@ -44,7 +44,7 @@ class ThirdPartyProtocolServlet(RestServlet): | |||
PATTERNS = client_patterns("/thirdparty/protocol/(?P<protocol>[^/]+)$") | |||
def __init__(self, hs): | |||
super(ThirdPartyProtocolServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.appservice_handler = hs.get_application_service_handler() | |||
@@ -65,7 +65,7 @@ class ThirdPartyUserServlet(RestServlet): | |||
PATTERNS = client_patterns("/thirdparty/user(/(?P<protocol>[^/]+))?$") | |||
def __init__(self, hs): | |||
super(ThirdPartyUserServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.appservice_handler = hs.get_application_service_handler() | |||
@@ -87,7 +87,7 @@ class ThirdPartyLocationServlet(RestServlet): | |||
PATTERNS = client_patterns("/thirdparty/location(/(?P<protocol>[^/]+))?$") | |||
def __init__(self, hs): | |||
super(ThirdPartyLocationServlet, self).__init__() | |||
super().__init__() | |||
self.auth = hs.get_auth() | |||
self.appservice_handler = hs.get_application_service_handler() | |||
@@ -28,7 +28,7 @@ class TokenRefreshRestServlet(RestServlet): | |||
PATTERNS = client_patterns("/tokenrefresh") | |||
def __init__(self, hs): | |||
super(TokenRefreshRestServlet, self).__init__() | |||
super().__init__() | |||
async def on_POST(self, request): | |||
raise AuthError(403, "tokenrefresh is no longer supported.") | |||
@@ -31,7 +31,7 @@ class UserDirectorySearchRestServlet(RestServlet): | |||
Args: | |||
hs (synapse.server.HomeServer): server | |||
""" | |||
super(UserDirectorySearchRestServlet, self).__init__() | |||
super().__init__() | |||
self.hs = hs | |||
self.auth = hs.get_auth() | |||
self.user_directory_handler = hs.get_user_directory_handler() | |||
@@ -28,7 +28,7 @@ class VersionsRestServlet(RestServlet): | |||
PATTERNS = [re.compile("^/_matrix/client/versions$")] | |||
def __init__(self, hs): | |||
super(VersionsRestServlet, self).__init__() | |||
super().__init__() | |||
self.config = hs.config | |||
def on_GET(self, request): | |||
@@ -172,7 +172,7 @@ class DataStore( | |||
else: | |||
self._cache_id_gen = None | |||
super(DataStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
self._presence_on_startup = self._get_active_presence(db_conn) | |||
@@ -42,7 +42,7 @@ class AccountDataWorkerStore(SQLBaseStore, metaclass=abc.ABCMeta): | |||
"AccountDataAndTagsChangeCache", account_max | |||
) | |||
super(AccountDataWorkerStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
@abc.abstractmethod | |||
def get_max_account_data_stream_id(self): | |||
@@ -313,7 +313,7 @@ class AccountDataStore(AccountDataWorkerStore): | |||
], | |||
) | |||
super(AccountDataStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
def get_max_account_data_stream_id(self) -> int: | |||
"""Get the current max stream id for the private user data stream | |||
@@ -52,7 +52,7 @@ class ApplicationServiceWorkerStore(SQLBaseStore): | |||
) | |||
self.exclusive_user_regex = _make_exclusive_regex(self.services_cache) | |||
super(ApplicationServiceWorkerStore, self).__init__(database, db_conn, hs) | |||
super().__init__(database, db_conn, hs) | |||
def get_app_services(self): | |||
return self.services_cache | |||