Apply ruff and mypy auto-fixes across codebase

Author: sandhose

integration-tests/matrix_is_tester/base_api_test.py

@@ -1,7 +1,3 @@
-#!/usr/bin/env python
-
-# -*- coding: utf-8 -*-
-
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +22,7 @@
 logger = logging.getLogger(__name__)
 
 
-class BaseApiTest(object):
+class BaseApiTest:
     """
     Not a test case itself, but can be subclassed to test APIs common
     between versions.
@@ -45,7 +41,7 @@ def test_ping(self):
 
     def test_request_email_code(self):
         body = self.api.request_email_code("fakeemail1@nowhere.test", "sekrit", 1)
-        logger.info("Got response %r" % (body,))
+        logger.info("Got response %r", body)
         self.assertIn("sid", body)
         self.mailSink.get_mail()
 
@@ -130,7 +126,7 @@ def test_store_invite(self):
             self.assertTrue(is_valid_body["valid"])
 
         mail = self.mailSink.get_mail()
-        logger.info("Got email (invite): %r" % (mail,))
+        logger.info("Got email (invite): %r", mail)
         mail_object = json.loads(mail["data"])
         self.assertEqual(mail_object["token"], body["token"])
         self.assertEqual(mail_object["room_alias"], "#alias:fake.test")

integration-tests/matrix_is_tester/fakehs.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,16 +31,16 @@ def token_for_random_user():
     The token will represent a random user account.
     """
     num = random.randint(0, 2**32)
-    user_id = "@user%d:127.0.0.1:4490" % (num,)
-    return "user:%s" % (base64.b64encode(user_id.encode("UTF-8")).decode("UTF-8"),)
+    user_id = f"@user{num}:127.0.0.1:4490"
+    return "user:{}".format(base64.b64encode(user_id.encode("UTF-8")).decode("UTF-8"))
 
 
 def token_for_user(user_id):
     """
     Return an OpenID token as would be obtained from the client/server API.
     The token will represent the user_id given.
     """
-    return "user:%s" % (base64.b64encode(user_id.encode("UTF-8")).decode("UTF-8"),)
+    return "user:{}".format(base64.b64encode(user_id.encode("UTF-8")).decode("UTF-8"))
 
 
 def get_shared_fake_hs():

integration-tests/matrix_is_tester/is_api.py

@@ -1,7 +1,3 @@
-#!/usr/bin/env python
-
-# -*- coding: utf-8 -*-
-
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +24,7 @@
 logger = logging.getLogger(__name__)
 
 
-class IsApi(object):
+class IsApi:
     """
     Wrappers around the IS REST API
     """
@@ -52,7 +48,7 @@ def __init__(self, base_url, version, mail_sink):
         elif version == "v2":
             self.apiRoot = base_url + "/_matrix/identity/v2"
         else:
-            raise Exception("Invalid version: %s" % (version,))
+            raise Exception(f"Invalid version: {version}")
 
         self.mail_sink = mail_sink
 
@@ -66,12 +62,12 @@ def make_account(self, hs_addr, openid_token=None):
             openid_token = token_for_random_user()
 
         body = self.register(":".join([str(x) for x in hs_addr]), openid_token)
-        self.headers = {"Authorization": "Bearer %s" % (body["token"],)}
+        self.headers = {"Authorization": "Bearer {}".format(body["token"])}
 
     def get_token_from_mail(self):
         mail = self.mail_sink.get_mail()
 
-        log.msg("Got email: %r" % (mail,))
+        logger.info("Got email: %r", mail)
         if "data" not in mail:
             raise Exception("Mail has no 'data'")
 
@@ -122,7 +118,7 @@ def request_and_submit_email_code(self, address):
             headers=self.headers,
         )
         body = resp.json()
-        log.msg("submitToken returned %r" % (body,))
+        logger.info("submitToken returned %r", body)
         if not body["success"]:
             raise Exception("Submit token failed")
         return {"sid": sid, "client_secret": client_secret}

integration-tests/matrix_is_tester/launch_is.py

@@ -1,7 +1,3 @@
-#!/usr/bin/env python
-
-# -*- coding: utf-8 -*-
-
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

integration-tests/matrix_is_tester/launcher.py

@@ -90,7 +90,7 @@ def launch(self):
         # XXX: wait for startup in a sensible way
         time.sleep(2)
 
-        self._baseUrl = "http://localhost:%d" % (port,)
+        self._baseUrl = f"http://localhost:{port}"
 
     def tearDown(self):
         print("Stopping sydent...")

integration-tests/matrix_is_tester/mailsink.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -82,5 +80,5 @@ def tearDown(self):
 if __name__ == "__main__":
     ms = MailSink()
     ms.launch()
-    print("%r" % (ms.get_mail(),))
+    print(f"{ms.get_mail()!r}")
     ms.tearDown()

integration-tests/matrix_is_tester/test_bind_denied.py

@@ -1,7 +1,3 @@
-#!/usr/bin/env python
-
-# -*- coding: utf-8 -*-
-
 # Copyright 2019 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

integration-tests/matrix_is_tester/test_v2.py

@@ -26,7 +26,7 @@ class V2Test(BaseApiTest, unittest.TestCase):
     API_VERSION = "v2"
 
     def setUp(self):
-        super(V2Test, self).setUp()
+        super().setUp()
 
         self.fakeHs = get_shared_fake_hs()
         self.api.make_account(
@@ -45,7 +45,7 @@ def test_bind_and_lookup(self):
 
         hash_details = self.api.hash_details()
 
-        lookup_str = "%s %s" % ("fakeemail3@nowhere.test", "email")
+        lookup_str = "{} {}".format("fakeemail3@nowhere.test", "email")
         body2 = self.api.hashed_lookup(
             [lookup_str], "none", hash_details["lookup_pepper"]
         )

stubs/twisted/internet/endpoints.pyi

@@ -1,4 +1,4 @@
-from typing import AnyStr, Optional
+from typing import AnyStr
 
 from twisted.internet import interfaces
 from twisted.internet.defer import Deferred
@@ -21,8 +21,8 @@ class HostnameEndpoint:
         host: AnyStr,
         port: int,
         timeout: float = ...,
-        bindAddress: Optional[bytes] = ...,
-        attemptDelay: Optional[float] = ...,
+        bindAddress: bytes | None = ...,
+        attemptDelay: float | None = ...,
     ): ...
     def connect(self, protocol_factory: IProtocolFactory) -> Deferred[IProtocol]: ...
 

stubs/twisted/internet/error.pyi

@@ -1,6 +1,6 @@
-from typing import Any, Optional
+from typing import Any
 
 class ConnectError(Exception):
-    def __init__(self, osError: Optional[Any] = ..., string: str = ...): ...
+    def __init__(self, osError: Any | None = ..., string: str = ...): ...
 
 class DNSLookupError(IOError): ...