datahold 4.0.0.dev32__tar.gz → 4.0.0.dev33__tar.gz

{datahold-4.0.0.dev32 → datahold-4.0.0.dev33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datahold
-Version: 4.0.0.dev32
+Version: 4.0.0.dev33
 Summary: This project wraps common mutable datastructures for inheritance with modification.
 Author-email: Johannes <johannes.programming@gmail.com>
 License-Expression: MIT

{datahold-4.0.0.dev32 → datahold-4.0.0.dev33}/pyproject.toml

@@ -31,7 +31,7 @@ license-files = [
 name = "datahold"
 readme = "README.rst"
 requires-python = ">=3.11"
-version = "4.0.0.dev32"
+version = "4.0.0.dev33"
 
 [project.urls]
 Download = "https://pypi.org/project/datahold/#files"

{datahold-4.0.0.dev32 → datahold-4.0.0.dev33}/src/datahold/__init__.py

@@ -33,15 +33,31 @@ __all__: list[str] = [
     "SetLike",
 ]
 
+import enum
 from abc import ABCMeta, abstractmethod
 from collections import abc
 from contextlib import contextmanager
 from types import NotImplementedType, TracebackType
-from typing import Any, Never, Protocol, Self, SupportsIndex, overload
+from typing import (
+    Any,
+    Never,
+    Protocol,
+    Self,
+    SupportsIndex,
+    overload,
+    runtime_checkable,
+)
 
 import setdoc
 from frozendict import frozendict
 
+### SENTINEL ###
+
+
+class Missing(enum.Enum):
+    MISSING = enum.auto()
+
+
 ### PROTOCOLS ###
 
 
@@ -61,7 +77,8 @@ class ContextManager[Enter](Protocol):
     ) -> object: ...
 
 
-class SupportsKeysAndGetitem[Key, Value](Protocol):
+@runtime_checkable
+class SupportsKeysAndGetItem[Key, Value](Protocol):
     """Provide protocol supporting keys and __getitem__."""
 
     @setdoc.basic
@@ -91,7 +108,7 @@ class Mapping_Frozen[Key, Value](Collection_Frozen[Key], Protocol):
     def __getitem__(self: Self, key: Never, /) -> Value: ...
 
 
-class SupportsDelitemAndSetitem[Key, Value](
+class SupportsDelItemAndSetItem[Key, Value](
     Protocol,
 ):
     @setdoc.basic
@@ -167,8 +184,9 @@ class MutableSequence_Mutable[Item](Protocol):
 type Dict[Key, Value] = dict[Key | str, Value | None]
 
 type Dict_Init[Key, Value] = (
-    SupportsKeysAndGetitem[Key, Value | None]
-    | SupportsKeysAndGetitem[Key | str, Value | None]
+    SupportsKeysAndGetItem[Key, Value | None]
+    | SupportsKeysAndGetItem[str, Value | None]
+    | SupportsKeysAndGetItem[Key | str, Value | None]
     | abc.Iterable[tuple[Key | str, Value | None]]
 )
 
@@ -322,9 +340,11 @@ class SetLike[Item: abc.Hashable](Set[Item]):
     @abstractmethod
     @setdoc.basic
     def __frozen__(self: Self, /) -> frozenset[Item]: ...
+
     @abstractmethod
     @setdoc.basic
     def __init__(self: Self, other: abc.Iterable[Item] = (), /) -> None: ...
+
     @setdoc.basic
     def difference(self: Self, /, *others: abc.Iterable[abc.Hashable]) -> Self:
         return type(self)(self.__frozen__().difference(*others))
@@ -487,7 +507,7 @@ class MutableMapping[Key: abc.Hashable, Value](
     abc.MutableMapping[Key | str, Value | None],
     MutableObject[
         Mapping_Frozen[Key | str, Value | None],
-        SupportsDelitemAndSetitem[Key | str, Value | None],
+        SupportsDelItemAndSetItem[Key | str, Value | None],
     ],
 ):
     """Provide abc for custom mutable mapping."""
@@ -506,6 +526,62 @@ class MutableMapping[Key: abc.Hashable, Value](
         with self.__mutate__() as mutable:
             mutable[key] = value
 
+    @overload
+    @setdoc.basic
+    def pop(self: Self, key: Key | str, /) -> Value: ...
+    @overload
+    @setdoc.basic
+    def pop[Value_](
+        self: Self, key: Key | str, default: Value_, /
+    ) -> Value | Value_: ...
+    @setdoc.basic
+    def pop[Value_](
+        self: Self,
+        key: Key | str,
+        default: Missing | Value_ = Missing.MISSING,
+        /,
+    ) -> Value | Value_ | None:
+        try:
+            value = self[key]
+        except KeyError:
+            if isinstance(default, Missing):
+                raise
+            return default
+        else:
+            del self[key]
+            return value
+
+    @setdoc.basic
+    def setdefault(
+        self: Self,
+        key: Key | str,
+        default: Value | None = None,
+        /,
+    ) -> Value | None:
+        try:
+            return self[key]
+        except KeyError:
+            self[key] = default
+        return default
+
+    @setdoc.basic
+    def update(
+        self: Self,
+        other: Dict_Init[Key, Value] = (),
+        /,
+        **kwargs: Value | None,
+    ) -> None:
+        key: Any
+        value: Value | None
+        if isinstance(other, SupportsKeysAndGetItem):
+            for key in other.keys():
+                self[key] = other[key]
+        else:
+            for key, value in other:
+                self[key] = value
+        for key, value in kwargs.items():
+            self[key] = value
+
 
 ### DICT-LIKE ###
 
@@ -546,7 +622,7 @@ class DictLike[Key: abc.Hashable, Value](
 
     @setdoc.basic
     def __reversed__(self: Self, /) -> abc.Iterator[Key]:
-        yield from reversed(self.__frozen__())
+        return reversed(self.__frozen__())
 
     @overload
     @classmethod
@@ -610,7 +686,7 @@ class MutableDictLike[Key: abc.Hashable, Value](
         **kwargs: Value | None,
     ) -> None:
         self.update(
-            other,  # type: ignore[arg-type]
+            other,
             **kwargs,
         )
 

{datahold-4.0.0.dev32 → datahold-4.0.0.dev33}/src/datahold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datahold
-Version: 4.0.0.dev32
+Version: 4.0.0.dev33
 Summary: This project wraps common mutable datastructures for inheritance with modification.
 Author-email: Johannes <johannes.programming@gmail.com>
 License-Expression: MIT

{datahold-4.0.0.dev32 → datahold-4.0.0.dev33}/tests/testdata.toml

@@ -269,6 +269,10 @@ generic = 1
 [datatypes.MutableMapping.attributes]
 __delitem__ = "datahold.MutableMapping"
 __setitem__ = "datahold.MutableMapping"
+clear = "collections.abc.MutableMapping"
+pop = "datahold.MutableMapping"
+popitem = "datahold.MutableMapping"
+setdefault = "datahold.MutableMapping"
 
 [datatypes.MutableMapping.issubclass]
 "collections.abc.MutableMapping" = true