Typing updates for recent mypy versions

changelog.d/481.misc

@@ -0,0 +1 @@
+Update type annotations to ensure Sydent typechecks with recent mypy versions.

sydent/db/accounts.py

@@ -104,7 +104,6 @@ def delToken(self, token: str) -> int:
             "delete from tokens where token = ?",
             (token,),
         )
-        # Cast safety: DBAPI-2 says this is a "number"; c.f. python/typeshed#6150
-        deleted = cast(int, cur.rowcount)
+        deleted = cur.rowcount
         self.sydent.db.commit()
         return deleted

sydent/db/invite_tokens.py

@@ -137,9 +137,7 @@ def validateEphemeralPublicKey(self, publicKey: str) -> bool:
             (publicKey,),
         )
         self.sydent.db.commit()
-        # Cast safety: DBAPI-2 says this is a "number"; c.f. python/typeshed#6150
-        rows = cast(int, cur.rowcount)
-        return rows > 0
+        return cur.rowcount > 0
 
     def getSenderForToken(self, token: str) -> Optional[str]:
         """

sydent/sydent.py

@@ -339,8 +339,9 @@ def setup_logging(config: SydentConfig) -> None:
     log_format = "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s" " - %(message)s"
     formatter = logging.Formatter(log_format)
 
+    handler: logging.Handler
     if log_path != "":
-        handler: logging.StreamHandler = logging.handlers.TimedRotatingFileHandler(
+        handler = logging.handlers.TimedRotatingFileHandler(
             log_path, when="midnight", backupCount=365
         )
         handler.setFormatter(formatter)