From 5ce6764d8ab9dc61d820c629578253490606903d Mon Sep 17 00:00:00 2001 From: Matt Wildoer Date: Thu, 24 Oct 2024 13:03:40 -0700 Subject: [PATCH] Normalize FuncDict and FuncSet util collections key and value callables (#102) --- src/faebryk/libs/util.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/faebryk/libs/util.py b/src/faebryk/libs/util.py index 6ceba3be..dabb8b1f 100644 --- a/src/faebryk/libs/util.py +++ b/src/faebryk/libs/util.py @@ -1010,16 +1010,14 @@ def __init__( def __contains__(self, item: T): return item in self._keys[self._hasher(item)] - @property def keys(self) -> Iterator[T]: yield from chain.from_iterable(self._keys.values()) - @property def values(self) -> Iterator[U]: yield from chain.from_iterable(self._values.values()) def __iter__(self) -> Iterator[T]: - yield from self.keys + yield from self.keys() def __len__(self) -> int: return sum(len(v) for v in self._values.values()) @@ -1054,7 +1052,7 @@ def __delitem__(self, key: T): def items(self) -> Iterable[tuple[T, U]]: """Iter key-value pairs as items, just like a dict.""" - yield from zip(self.keys, self.values) + yield from zip(self.keys(), self.values()) def __repr__(self) -> str: return (