datahold 4.0.0.dev30__tar.gz → 4.0.0.dev32__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datahold
-Version: 4.0.0.dev30
+Version: 4.0.0.dev32
 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.dev30 → datahold-4.0.0.dev32}/pyproject.toml

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

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

@@ -89,15 +89,17 @@ class SupportsAddAndDiscard[Item: abc.Hashable](Protocol):
 class Mapping_Frozen[Key, Value](Collection_Frozen[Key], Protocol):
     @setdoc.basic
     def __getitem__(self: Self, key: Never, /) -> Value: ...
+
+
 class SupportsDelitemAndSetitem[Key, Value](
     Protocol,
 ):
     @setdoc.basic
-    def __delitem__(self: Self, key: Key | str, /) -> object: ...
+    def __delitem__(self: Self, key: Key, /) -> object: ...
     @setdoc.basic
-    def __setitem__(
-        self: Self, key: Key | str, value: Value | None, /
-    ) -> object: ...
+    def __setitem__(self: Self, key: Key, value: Value, /) -> object: ...
+
+
 class Sequence_Frozen[Item](
     Collection_Frozen[Item],
     Protocol,
@@ -165,7 +167,8 @@ class MutableSequence_Mutable[Item](Protocol):
 type Dict[Key, Value] = dict[Key | str, Value | None]
 
 type Dict_Init[Key, Value] = (
-    SupportsKeysAndGetitem[Key | str, Value | None]
+    SupportsKeysAndGetitem[Key, Value | None]
+    | SupportsKeysAndGetitem[Key | str, Value | None]
     | abc.Iterable[tuple[Key | str, Value | None]]
 )
 
@@ -462,9 +465,11 @@ class Mapping[Key: abc.Hashable, Value](
             raise KeyError(key) from None
 
     @overload
-    def get(self, key: object) -> Value | None: ...
+    def get(self, key: object, /) -> Value | None: ...
     @overload
-    def get[Value_](self, key: object, default: Value_) -> Value | Value_: ...
+    def get[Value_](
+        self, key: object, default: Value_, /
+    ) -> Value | Value_: ...
     @setdoc.basic
     def get[Value_](
         self: Self, key: object, default: Value_ | None = None
@@ -478,7 +483,7 @@ class Mapping[Key: abc.Hashable, Value](
 
 
 class MutableMapping[Key: abc.Hashable, Value](
-    Mapping[Key, Value],
+    Mapping[Key | str, Value | None],
     abc.MutableMapping[Key | str, Value | None],
     MutableObject[
         Mapping_Frozen[Key | str, Value | None],
@@ -506,7 +511,8 @@ class MutableMapping[Key: abc.Hashable, Value](
 
 
 class DictLike[Key: abc.Hashable, Value](
-    Mapping[Key | str, Value | None],
+    Mapping[Key, Value],
+    abc.Reversible[Key],
 ):
     """Provide abc for custom dict-like."""
 
@@ -514,7 +520,7 @@ class DictLike[Key: abc.Hashable, Value](
 
     @abstractmethod
     @setdoc.basic
-    def __frozen__(self: Self, /) -> FrozenDict[Key, Value]: ...
+    def __frozen__(self: Self, /) -> frozendict[Key, Value]: ...
 
     @abstractmethod
     @setdoc.basic
@@ -524,34 +530,54 @@ class DictLike[Key: abc.Hashable, Value](
         /,
         **kwargs: Value,
     ): ...
+
     @setdoc.basic
-    def __or__[Key_, Value_](
+    def __or__[Key_: abc.Hashable, Value_](
         self: Self,
-        other: Dict_Init[Key_, Value_],
+        other: DictLike[Key_, Value_],
         /,
     ) -> DictLike[Key | Key_, Value | Value_]:
-        data: FrozenDict[Key, Value]
-        try:
-            data = frozendict(other)  # type: ignore[arg-type]
-        except TypeError:
+        if isinstance(other, DictLike):
+            return type(self)(  # type: ignore[return-value]
+                self.__frozen__() | other  # type: ignore[arg-type]
+            )
+        else:
             return NotImplemented
-        return type(self)(  # type: ignore[return-value]
-            self.__frozen__() | data
-        )
 
+    @setdoc.basic
+    def __reversed__(self: Self, /) -> abc.Iterator[Key]:
+        yield from reversed(self.__frozen__())
+
+    @overload
     @classmethod
     @setdoc.basic
     def fromkeys(
         cls: type[Self],
-        iterable: abc.Iterable[Key | str],
-        value: Value | None = None,
+        iterable: abc.Iterable[Key],
         /,
-    ) -> Self:
+    ) -> DictLike[Key, None]: ...
+    @overload
+    @classmethod
+    @setdoc.basic
+    def fromkeys(
+        cls: type[Self],
+        iterable: abc.Iterable[Key],
+        value: Value,
+        /,
+    ) -> Self: ...
+    @classmethod
+    @setdoc.basic
+    def fromkeys(
+        cls: type[Self],
+        iterable: abc.Iterable[Key],
+        value: Any = None,
+        /,
+    ) -> Any:
         return cls(dict.fromkeys(iterable, value))
 
 
 class FrozenDictLike[Key: abc.Hashable, Value](
-    FrozenObjectLike[FrozenDict[Key, Value]],
+    FrozenObjectLike[frozendict[Key, Value]],
     DictLike[Key, Value],
 ):
     """Provide abc for custom frozen dict-like."""
@@ -560,7 +586,7 @@ class FrozenDictLike[Key: abc.Hashable, Value](
 
 
 class MutableDictLike[Key: abc.Hashable, Value](
-    DictLike[Key, Value],
+    DictLike[Key | str, Value | None],
     MutableObjectLike[FrozenDict[Key, Value], Dict[Key, Value]],
     MutableMapping[Key, Value],
 ):
@@ -582,8 +608,11 @@ class MutableDictLike[Key: abc.Hashable, Value](
         other: Dict_Init[Key, Value] = (),
         /,
         **kwargs: Value | None,
-    ):
-        self.update(other, **kwargs)
+    ) -> None:
+        self.update(
+            other,  # type: ignore[arg-type]
+            **kwargs,
+        )
 
     @setdoc.basic
     def __ior__(  # type: ignore[override]
@@ -592,7 +621,7 @@ class MutableDictLike[Key: abc.Hashable, Value](
         /,
     ) -> Self:
         with self.__mutate__() as mutable:
-            mutable |= other
+            mutable |= other  # type: ignore[arg-type]
         return self
 
     @setdoc.basic
@@ -608,7 +637,7 @@ class MutableDictLike[Key: abc.Hashable, Value](
 
 
 class FrozenDictSlot[Key: abc.Hashable, Value](
-    FrozenObjectSlot[FrozenDict[Key, Value]],
+    FrozenObjectSlot[frozendict[Key, Value]],
     FrozenDictLike[Key, Value],
 ):
     """Provide slotted frozen dict-like."""
@@ -622,7 +651,10 @@ class FrozenDictSlot[Key: abc.Hashable, Value](
         /,
         **kwargs: Value | None,
     ) -> None:
-        self._slot = frozendict(other, **kwargs)  # type: ignore[arg-type]
+        self._slot = frozendict(
+            other,  # type: ignore[arg-type]
+            **kwargs,
+        )
 
 
 class MutableDictSlot[Key: abc.Hashable, Value](

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

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