Improve type checking

changelog.d/358.misc

@@ -0,0 +1 @@
+This change fixes small, simple errors raised by mypy. 

sydent/db/valsession.py

@@ -132,7 +132,7 @@ def setSendAttemptNumber(self, sid: int, attemptNo: int) -> None:
         Updates the send attempt number for the session with the given ID.
 
         :param sid: The ID of the session to update
-        :type sid: unicode
+        :type sid: int
         :param attemptNo: The send attempt number to update the session with.
         :type attemptNo: int
         """
@@ -149,7 +149,7 @@ def setValidated(self, sid: int, validated: bool) -> None:
         Updates a session to set the validated flag to the given value.
 
         :param sid: The ID of the session to update.
-        :type sid: unicode
+        :type sid: int
         :param validated: The value to set the validated flag.
         :type validated: bool
         """
@@ -166,7 +166,7 @@ def setMtime(self, sid: int, mtime: int) -> None:
         Set the time of the last send attempt for the session with the given ID
 
         :param sid: The ID of the session to update.
-        :type sid: unicode
+        :type sid: int
         :param mtime: The time of the last send attempt for that session.
         :type mtime: int
         """
@@ -183,7 +183,7 @@ def getSessionById(self, sid: int) -> Optional[ValidationSession]:
         Retrieves the session matching the given sid.
 
         :param sid: The ID of the session to retrieve.
-        :type sid: unicode
+        :type sid: int
 
         :return: The retrieved session, or None if no session could be found with that
             sid.
@@ -210,7 +210,7 @@ def getTokenSessionById(self, sid: int) -> Optional[ValidationSession]:
         Retrieves a validation session using the session's ID.
 
         :param sid: The ID of the session to retrieve.
-        :type sid: unicode
+        :type sid: int
 
         :return: The validation session, or None if no session was found with that ID.
         :rtype: ValidationSession or None
@@ -239,7 +239,7 @@ def getValidatedSession(self, sid: int, clientSecret: str) -> ValidationSession:
         one passed in.
 
         :param sid: The ID of the session to retrieve.
-        :type sid: unicode
+        :type sid: int
         :param clientSecret: A client secret to check against the one retrieved from
             the database.
         :type clientSecret: unicode

sydent/http/httpcommon.py

@@ -136,6 +136,7 @@ def dataReceived(self, data) -> None:
             self.deferred.errback(BodyExceededMaxSize())
             # Close the connection (forcefully) since all the data will get
             # discarded anyway.
+            assert self.transport is not None
             self.transport.abortConnection()
 
     def connectionLost(self, reason=connectionDone) -> None:

sydent/http/matrixfederationagent.py

@@ -15,12 +15,11 @@
 import logging
 import random
 import time
-from typing import Generator, Optional
+from typing import TYPE_CHECKING, Generator, Optional
 
 import attr
 from netaddr import IPAddress  # type: ignore
 from twisted.internet import defer
-from twisted.internet.defer import Deferred
 from twisted.internet.endpoints import HostnameEndpoint, wrapClientTLS
 from twisted.internet.interfaces import IStreamClientEndpoint
 from twisted.web.client import URI, Agent, HTTPConnectionPool, RedirectAgent
@@ -34,6 +33,9 @@
 from sydent.util import json_decoder
 from sydent.util.ttlcache import TTLCache
 
+if TYPE_CHECKING:
+    from twisted.web.iweb import IBodyProducer
+
 # period to cache .well-known results for by default
 WELL_KNOWN_DEFAULT_CACHE_PERIOD = 24 * 3600
 
@@ -167,6 +169,7 @@ def request(
         else:
             headers = headers.copy()
 
+        assert headers is not None
         if not headers.hasHeader(b"host"):
             headers.addRawHeader(b"host", res.host_header)
 
@@ -189,7 +192,7 @@ def endpointForURI(_uri):
     @defer.inlineCallbacks
     def _route_matrix_uri(
         self, parsed_uri: "URI", lookup_well_known: bool = True
-    ) -> "Deferred":
+    ) -> Generator:
         """Helper for `request`: determine the routing for a Matrix URI
 
         :param parsed_uri: uri to route. Note that it should be parsed with
@@ -320,6 +323,7 @@ def _get_well_known(self, server_name: bytes) -> Generator:
             result, cache_period = yield self._do_get_well_known(server_name)
 
             if cache_period > 0:
+                assert self._well_known_cache is not None
                 self._well_known_cache.set(server_name, result, cache_period)
 
         defer.returnValue(result)
@@ -357,7 +361,7 @@ def _do_get_well_known(self, server_name: bytes) -> Generator:
 
             # add some randomness to the TTL to avoid a stampeding herd every hour
             # after startup
-            cache_period = WELL_KNOWN_INVALID_CACHE_PERIOD
+            cache_period: float = WELL_KNOWN_INVALID_CACHE_PERIOD
             cache_period += random.uniform(0, WELL_KNOWN_DEFAULT_CACHE_PERIOD_JITTER)
             defer.returnValue((None, cache_period))
             return

sydent/http/srvresolver.py

@@ -27,7 +27,7 @@
 
 logger = logging.getLogger(__name__)
 
-SERVER_CACHE = {}
+SERVER_CACHE: Dict[bytes, List["Server"]] = {}
 
 
 @attr.s

sydent/replication/peer.py

@@ -17,7 +17,7 @@
 import configparser
 import json
 import logging
-from typing import TYPE_CHECKING, Any, Dict
+from typing import TYPE_CHECKING, Any, Dict, cast
 
 import signedjson.key
 import signedjson.sign
@@ -85,6 +85,7 @@ def pushUpdates(self, sgAssocs: Dict[int, Dict[str, Any]]) -> "Deferred":
         """
         globalAssocStore = GlobalAssociationStore(self.sydent)
         for localId in sgAssocs:
+            assert self.lastId is not None
             if localId > self.lastId:
                 assocObj = threePidAssocFromDict(sgAssocs[localId])
 
@@ -258,7 +259,7 @@ def _pushSuccess(
             the status code.
         :type updateDeferred: twisted.internet.defer.Deferred
         """
-        if result.code >= 200 and result.code < 300:
+        if cast(int, result.code) >= 200 and cast(int, result.code) < 300:
             updateDeferred.callback(result)
         else:
             d = readBody(result)

sydent/sms/openmarket.py

@@ -14,7 +14,7 @@
 
 import logging
 from base64 import b64encode
-from typing import TYPE_CHECKING, Dict, Optional
+from typing import TYPE_CHECKING, Dict, Generator, Optional
 
 from twisted.internet import defer
 from twisted.web.http_headers import Headers
@@ -64,7 +64,7 @@ def __init__(self, sydent: "Sydent") -> None:
     @defer.inlineCallbacks
     def sendTextSMS(
         self, body: Dict, dest: str, source: Optional[Dict[str, str]] = None
-    ) -> None:
+    ) -> Generator:
         """
         Sends a text message with the given body to the given MSISDN.
 

sydent/threepid/bind.py

@@ -16,7 +16,7 @@
 import collections
 import logging
 import math
-from typing import TYPE_CHECKING, Any, Dict, Union
+from typing import TYPE_CHECKING, Any, Dict, Generator, Union
 
 import signedjson.sign  # type: ignore
 from twisted.internet import defer
@@ -92,6 +92,7 @@ def addBinding(self, medium: str, address: str, mxid: str) -> Dict[str, Any]:
         joinTokenStore = JoinTokenStore(self.sydent)
         pendingJoinTokens = joinTokenStore.getTokens(medium, address)
         invites = []
+        token: Any
         for token in pendingJoinTokens:
             token["mxid"] = mxid
             token["signed"] = {
@@ -127,7 +128,7 @@ def removeBinding(self, threepid: Dict[str, str], mxid: str) -> None:
         self.sydent.pusher.doLocalPush()
 
     @defer.inlineCallbacks
-    def _notify(self, assoc: Dict[str, Any], attempt: int) -> None:
+    def _notify(self, assoc: Dict[str, Any], attempt: int) -> Generator:
         """
         Sends data about a new association (and, if necessary, the associated invites)
         to the associated MXID's homeserver.

sydent/util/emailutils.py

@@ -102,7 +102,7 @@ def sendEmail(
     )
     try:
         if mailTLSMode == "SSL" or mailTLSMode == "TLS":
-            smtp = smtplib.SMTP_SSL(mailServer, mailPort, myHostname)
+            smtp: Any = smtplib.SMTP_SSL(mailServer, mailPort, myHostname)
         elif mailTLSMode == "STARTTLS":
             smtp = smtplib.SMTP(mailServer, mailPort, myHostname)
             smtp.starttls()

sydent/util/stringutils.py

@@ -67,7 +67,7 @@ def is_valid_hostname(string: str) -> bool:
     return hostname_regex.match(string) is not None
 
 
-def parse_server_name(server_name: str) -> Tuple[str, Optional[int]]:
+def parse_server_name(server_name: str) -> Tuple[str, Optional[str]]:
     """Split a server name into host/port parts.
 
     No validation is done on the host part. The port part is validated to be

sydent/validators/common.py

@@ -18,7 +18,7 @@
 
 
 def validateSessionWithToken(
-    sydent: "Sydent", sid: str, clientSecret: str, token: str
+    sydent: "Sydent", sid: int, clientSecret: str, token: str
 ) -> Dict[str, bool]:
     """
     Attempt to validate a session, identified by the sid, using

sydent/validators/emailvalidator.py

@@ -141,13 +141,13 @@ def makeValidateLink(
         return link
 
     def validateSessionWithToken(
-        self, sid: str, clientSecret: str, token: str
+        self, sid: int, clientSecret: str, token: str
     ) -> Dict[str, bool]:
         """
         Validates the session with the given ID.
 
         :param sid: The ID of the session to validate.
-        :type sid: unicode
+        :type sid: int
         :param clientSecret: The client secret to validate.
         :type clientSecret: unicode
         :param token: The token to validate.

sydent/validators/msisdnvalidator.py

@@ -175,13 +175,13 @@ def getOriginator(
         return origs[sum(int(i) for i in msisdn) % len(origs)]
 
     def validateSessionWithToken(
-        self, sid: str, clientSecret: str, token: str
+        self, sid: int, clientSecret: str, token: str
     ) -> Dict[str, bool]:
         """
         Validates the session with the given ID.
 
         :param sid: The ID of the session to validate.
-        :type sid: unicode
+        :type sid: int
         :param clientSecret: The client secret to validate.
         :type clientSecret: unicode
         :param token: The token to validate.