From c542b8463707cd5720822de260f79b61c7582994 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 2 Dec 2022 08:47:07 -0500 Subject: [PATCH] remove the annotations everything is broken on older pythons --- src/allmydata/testing/web.py | 2 +- src/allmydata/util/dictutil.py | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/allmydata/testing/web.py b/src/allmydata/testing/web.py index 72ecd7161..4f68b3774 100644 --- a/src/allmydata/testing/web.py +++ b/src/allmydata/testing/web.py @@ -140,7 +140,7 @@ class _FakeTahoeUriHandler(Resource, object): isLeaf = True - data: BytesKeyDict[bytes] = attr.ib(default=attr.Factory(BytesKeyDict)) + data: BytesKeyDict = attr.ib(default=attr.Factory(BytesKeyDict)) capability_generators = attr.ib(default=attr.Factory(dict)) def _generate_capability(self, kind): diff --git a/src/allmydata/util/dictutil.py b/src/allmydata/util/dictutil.py index c436ab963..0a7df0a38 100644 --- a/src/allmydata/util/dictutil.py +++ b/src/allmydata/util/dictutil.py @@ -2,10 +2,6 @@ Tools to mess with dicts. """ -from __future__ import annotations - -from typing import TypeVar, Type - class DictOfSets(dict): def add(self, key, value): if key in self: @@ -68,10 +64,7 @@ class AuxValueDict(dict): self.auxilliary[key] = auxilliary -K = TypeVar("K") -V = TypeVar("V") - -class _TypedKeyDict(dict[K, V]): +class _TypedKeyDict(dict): """Dictionary that enforces key type. Doesn't override everything, but probably good enough to catch most @@ -80,7 +73,7 @@ class _TypedKeyDict(dict[K, V]): Subclass and override KEY_TYPE. """ - KEY_TYPE: Type[K] + KEY_TYPE = object def __init__(self, *args, **kwargs): dict.__init__(self, *args, **kwargs) @@ -105,13 +98,13 @@ for _method_name in ["__setitem__", "__getitem__", "setdefault", "get", del _method_name -class BytesKeyDict(_TypedKeyDict[bytes, V]): +class BytesKeyDict(_TypedKeyDict): """Keys should be bytes.""" KEY_TYPE = bytes -class UnicodeKeyDict(_TypedKeyDict[str, V]): +class UnicodeKeyDict(_TypedKeyDict): """Keys should be unicode strings.""" KEY_TYPE = str