tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Fixup the annotations a bit

This commit is contained in:
Jean-Paul Calderone 2022-12-02 08:38:46 -05:00
parent b40d882fce
commit c6cc3708f4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/testing/web.py
View File

@ -140,7 +140,7 @@ class _FakeTahoeUriHandler(Resource, object):
isLeaf = True isLeaf = True
data: BytesKeyDict[bytes, bytes] = attr.ib(default=attr.Factory(BytesKeyDict)) data: BytesKeyDict[bytes] = attr.ib(default=attr.Factory(BytesKeyDict))
capability_generators = attr.ib(default=attr.Factory(dict)) capability_generators = attr.ib(default=attr.Factory(dict))
def _generate_capability(self, kind): def _generate_capability(self, kind):

15
src/allmydata/util/dictutil.py
View File

@ -2,6 +2,10 @@
Tools to mess with dicts. Tools to mess with dicts.
""" """
from __future__ import annotations
from typing import TypeVar, Type
class DictOfSets(dict): class DictOfSets(dict):
def add(self, key, value): def add(self, key, value):
if key in self: if key in self:
@ -64,7 +68,10 @@ class AuxValueDict(dict):
self.auxilliary[key] = auxilliary self.auxilliary[key] = auxilliary
class _TypedKeyDict(dict): K = TypeVar("K")
V = TypeVar("V")
class _TypedKeyDict(dict[K, V]):
"""Dictionary that enforces key type. """Dictionary that enforces key type.
Doesn't override everything, but probably good enough to catch most Doesn't override everything, but probably good enough to catch most
@ -73,7 +80,7 @@ class _TypedKeyDict(dict):
Subclass and override KEY_TYPE. Subclass and override KEY_TYPE.
""" """
KEY_TYPE = object KEY_TYPE: Type[K]
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
dict.__init__(self, *args, **kwargs) dict.__init__(self, *args, **kwargs)
@ -98,13 +105,13 @@ for _method_name in ["__setitem__", "__getitem__", "setdefault", "get",
del _method_name del _method_name
class BytesKeyDict(_TypedKeyDict): class BytesKeyDict(_TypedKeyDict[bytes, V]):
"""Keys should be bytes.""" """Keys should be bytes."""
KEY_TYPE = bytes KEY_TYPE = bytes
class UnicodeKeyDict(_TypedKeyDict): class UnicodeKeyDict(_TypedKeyDict[str, V]):
"""Keys should be unicode strings.""" """Keys should be unicode strings."""
KEY_TYPE = str KEY_TYPE = str