datahold 4.0.0.dev29__tar.gz → 4.0.0.dev30__tar.gz

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

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

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

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

@@ -37,15 +37,7 @@ from abc import ABCMeta, abstractmethod
 from collections import abc
 from contextlib import contextmanager
 from types import NotImplementedType, TracebackType
-from typing import (
-    Any,
-    Never,
-    Optional,
-    Protocol,
-    Self,
-    SupportsIndex,
-    overload,
-)
+from typing import Any, Never, Protocol, Self, SupportsIndex, overload
 
 import setdoc
 from frozendict import frozendict
@@ -87,7 +79,7 @@ class Collection_Frozen[Item](
     def __contains__(self: Self, other: Never, /) -> bool: ...
 
 
-class MutableSet_Mutable[Item: abc.Hashable](Protocol):
+class SupportsAddAndDiscard[Item: abc.Hashable](Protocol):
     @setdoc.basic
     def add(self: Self, item: Item, /) -> object: ...
     @setdoc.basic
@@ -97,14 +89,14 @@ class MutableSet_Mutable[Item: abc.Hashable](Protocol):
 class Mapping_Frozen[Key, Value](Collection_Frozen[Key], Protocol):
     @setdoc.basic
     def __getitem__(self: Self, key: Never, /) -> Value: ...
-class MutableMapping_Mutable[Key_, Value_](
+class SupportsDelitemAndSetitem[Key, Value](
     Protocol,
 ):
     @setdoc.basic
-    def __delitem__(self: Self, key: Key_ | str, /) -> object: ...
+    def __delitem__(self: Self, key: Key | str, /) -> object: ...
     @setdoc.basic
     def __setitem__(
-        self: Self, key: Key_ | str, value: Optional[Value_], /
+        self: Self, key: Key | str, value: Value | None, /
     ) -> object: ...
 class Sequence_Frozen[Item](
     Collection_Frozen[Item],
@@ -170,16 +162,16 @@ class MutableSequence_Mutable[Item](Protocol):
 
 ### TYPE ALIASES ###
 
-type Dict[Key, Value] = dict[Key | str, Optional[Value]]
+type Dict[Key, Value] = dict[Key | str, Value | None]
 
 type Dict_Init[Key, Value] = (
-    SupportsKeysAndGetitem[Key | str, Optional[Value]]
-    | abc.Iterable[tuple[Key | str, Optional[Value]]]
+    SupportsKeysAndGetitem[Key | str, Value | None]
+    | abc.Iterable[tuple[Key | str, Value | None]]
 )
 
-type FrozenDict[Key, Value] = frozendict[Key | str, Optional[Value]]
+type FrozenDict[Key, Value] = frozendict[Key | str, Value | None]
 
-type Slice[Index] = slice[Optional[Index], Optional[Index], Optional[Index]]
+type Slice[Index] = slice[Index | None, Index | None, Index | None]
 
 
 ### OBJECT ###
@@ -299,7 +291,7 @@ class Set[Item: abc.Hashable](Collection[Item], abc.Set[Item]):
 class MutableSet[Item: abc.Hashable](
     Set[Item],
     abc.MutableSet[Item],
-    MutableObject[Collection_Frozen[Item], MutableSet_Mutable[Item]],
+    MutableObject[Collection_Frozen[Item], SupportsAddAndDiscard[Item]],
 ):
     """Provide abc for custom mutable set."""
 
@@ -470,13 +462,13 @@ class Mapping[Key: abc.Hashable, Value](
             raise KeyError(key) from None
 
     @overload
-    def get(self, key: object) -> Optional[Value]: ...
+    def get(self, key: object) -> Value | None: ...
     @overload
     def get[Value_](self, key: object, default: Value_) -> Value | Value_: ...
     @setdoc.basic
     def get[Value_](
-        self: Self, key: object, default: Optional[Value_] = None
-    ) -> Optional[Value | Value_]:
+        self: Self, key: object, default: Value_ | None = None
+    ) -> Value | Value_ | None:
         # this method is just as Mapping.get
         # with the signature corrected
         try:
@@ -487,8 +479,11 @@ class Mapping[Key: abc.Hashable, Value](
 
 class MutableMapping[Key: abc.Hashable, Value](
     Mapping[Key, Value],
-    abc.MutableMapping[Key | str, Optional[Value]],
-    MutableObject[FrozenDict[Key, Value], Dict[Key, Value]],
+    abc.MutableMapping[Key | str, Value | None],
+    MutableObject[
+        Mapping_Frozen[Key | str, Value | None],
+        SupportsDelitemAndSetitem[Key | str, Value | None],
+    ],
 ):
     """Provide abc for custom mutable mapping."""
 
@@ -501,7 +496,7 @@ class MutableMapping[Key: abc.Hashable, Value](
 
     @setdoc.basic
     def __setitem__(
-        self: Self, key: Key | str, value: Optional[Value], /
+        self: Self, key: Key | str, value: Value | None, /
     ) -> None:
         with self.__mutate__() as mutable:
             mutable[key] = value
@@ -511,7 +506,7 @@ class MutableMapping[Key: abc.Hashable, Value](
 
 
 class DictLike[Key: abc.Hashable, Value](
-    Mapping[Key | str, Optional[Value]],
+    Mapping[Key | str, Value | None],
 ):
     """Provide abc for custom dict-like."""
 
@@ -549,7 +544,7 @@ class DictLike[Key: abc.Hashable, Value](
     def fromkeys(
         cls: type[Self],
         iterable: abc.Iterable[Key | str],
-        value: Optional[Value] = None,
+        value: Value | None = None,
         /,
     ) -> Self:
         return cls(dict.fromkeys(iterable, value))
@@ -586,7 +581,7 @@ class MutableDictLike[Key: abc.Hashable, Value](
         self: Self,
         other: Dict_Init[Key, Value] = (),
         /,
-        **kwargs: Optional[Value],
+        **kwargs: Value | None,
     ):
         self.update(other, **kwargs)
 
@@ -601,7 +596,7 @@ class MutableDictLike[Key: abc.Hashable, Value](
         return self
 
     @setdoc.basic
-    def popitem(self: Self, /) -> tuple[Key | str, Optional[Value]]:
+    def popitem(self: Self, /) -> tuple[Key | str, Value | None]:
         # for most dict d
         # dict.popitem(d) and collections.abc.MutableMapping.popitem(d)
         # behave differently
@@ -625,7 +620,7 @@ class FrozenDictSlot[Key: abc.Hashable, Value](
         self: Self,
         other: Dict_Init[Key, Value] = (),
         /,
-        **kwargs: Optional[Value],
+        **kwargs: Value | None,
     ) -> None:
         self._slot = frozendict(other, **kwargs)  # type: ignore[arg-type]
 

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

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