Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions electrum/lrucache.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ def pop(self, _):

_KT = TypeVar("_KT")
_VT = TypeVar("_VT")


class Cache(collections.abc.MutableMapping[_KT, _VT]):
"""Mutable mapping to serve as a simple cache or cache base class."""

Expand Down Expand Up @@ -115,13 +117,14 @@ def get(self, key: _KT, default: _VT = None) -> _VT | None:
return default

def pop(self, key: _KT, default=__marker) -> _VT:
if key in self:
value = self[key]
try:
value = self.__data[key]
del self[key]
elif default is self.__marker:
raise KeyError(key)
else:
value = default
except KeyError:
if default is self.__marker:
raise KeyError(key)
else:
value = default
return value

def setdefault(self, key: _KT, default: _VT = None) -> _VT | None:
Expand Down