Merge pull request #1351 from tahoe-lafs/4082-upgrade-mypy

Upgrade to mypy 1.8

src/allmydata/storage_client.py

@@ -32,7 +32,7 @@
 
 from __future__ import annotations
 
-from typing import Union, Callable, Any, Optional, cast, Dict
+from typing import Union, Callable, Any, Optional, cast, Dict, Iterable
 from os import urandom
 import re
 import time
@@ -139,9 +139,9 @@ class StorageClientConfig(object):
         only upload to a storage-server that has a valid certificate
         signed by at least one of these keys.
     """
-    preferred_peers = attr.ib(default=())
-    storage_plugins = attr.ib(default=attr.Factory(dict))
-    grid_manager_keys = attr.ib(default=attr.Factory(list))
+    preferred_peers : Iterable[bytes] = attr.ib(default=())
+    storage_plugins : dict[str, dict[str, str]] = attr.ib(default=attr.Factory(dict))
+    grid_manager_keys : list[ed25519.Ed25519PublicKey] = attr.ib(default=attr.Factory(list))
 
     @classmethod
     def from_node_config(cls, config):
@@ -1107,18 +1107,21 @@ def try_to_connect(self):
 async def _pick_a_http_server(
         reactor,
         nurls: list[DecodedURL],
-        request: Callable[[Any, DecodedURL], defer.Deferred[Any]]
+        request: Callable[[object, DecodedURL], defer.Deferred[object]]
 ) -> DecodedURL:
     """Pick the first server we successfully send a request to.
 
     Fires with ``None`` if no server was found, or with the ``DecodedURL`` of
     the first successfully-connected server.
     """
-    queries = race([
-        request(reactor, nurl).addCallback(lambda _, nurl=nurl: nurl)
-        for nurl in nurls
-    ])
+    requests = []
+    for nurl in nurls:
+        def to_nurl(_: object, nurl: DecodedURL=nurl) -> DecodedURL:
+            return nurl
 
+        requests.append(request(reactor, nurl).addCallback(to_nurl))
+
+    queries: defer.Deferred[tuple[int, DecodedURL]] = race(requests)
     _, nurl = await queries
     return nurl
 

src/allmydata/test/common.py

@@ -177,8 +177,8 @@ class MemoryIntroducerClient(object):
     sequencer = attr.ib()
     cache_filepath = attr.ib()
 
-    subscribed_to = attr.ib(default=attr.Factory(list))
-    published_announcements = attr.ib(default=attr.Factory(list))
+    subscribed_to : list[Subscription] = attr.ib(default=attr.Factory(list))
+    published_announcements : list[Announcement] = attr.ib(default=attr.Factory(list))
 
 
     def setServiceParent(self, parent):
@@ -288,7 +288,7 @@ class UseNode(object):
     basedir = attr.ib(validator=attr.validators.instance_of(FilePath))
     introducer_furl = attr.ib(validator=attr.validators.instance_of(str),
                               converter=six.ensure_str)
-    node_config = attr.ib(default=attr.Factory(dict))
+    node_config : dict[bytes,bytes] = attr.ib(default=attr.Factory(dict))
 
     config = attr.ib(default=None)
     reactor = attr.ib(default=None)

src/allmydata/test/test_storage_client.py

@@ -41,6 +41,7 @@
 
 from twisted.internet.interfaces import (
     IStreamClientEndpoint,
+    IProtocolFactory,
 )
 from twisted.application.service import (
     Service,
@@ -604,7 +605,7 @@ class SpyHandler(object):
         ``Deferred`` that was returned from ``connect`` and the factory that
         was passed to ``connect``.
     """
-    _connects = attr.ib(default=attr.Factory(list))
+    _connects : list[tuple[Deferred[object], IProtocolFactory]]= attr.ib(default=attr.Factory(list))
 
     def hint_to_endpoint(self, hint, reactor, update_status):
         return (SpyEndpoint(self._connects.append), hint)

src/allmydata/testing/web.py

@@ -14,6 +14,7 @@
 from __future__ import annotations
 
 import hashlib
+from typing import Iterable
 
 import attr
 
@@ -141,7 +142,7 @@ class _FakeTahoeUriHandler(Resource, object):
     isLeaf = True
 
     data: BytesKeyDict = attr.ib(default=attr.Factory(BytesKeyDict))
-    capability_generators = attr.ib(default=attr.Factory(dict))
+    capability_generators: dict[bytes,Iterable[bytes]] = attr.ib(default=attr.Factory(dict))
 
     def _generate_capability(self, kind):
         """

tox.ini

@@ -124,7 +124,7 @@ commands =
 [testenv:typechecks]
 basepython = python3
 deps =
-    mypy==1.5.1
+    mypy==1.8.0
     mypy-zope
     types-mock
     types-six