datahold 4.0.0.dev7__tar.gz → 4.0.0.dev8__tar.gz

{datahold-4.0.0.dev7 → datahold-4.0.0.dev8}/PKG-INFO

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

@@ -34,7 +34,7 @@ license-files = [
 name = "datahold"
 readme = "README.rst"
 requires-python = ">=3.12"
-version = "4.0.0.dev7"
+version = "4.0.0.dev8"
 
 [project.urls]
 Download = "https://pypi.org/project/datahold/#files"

{datahold-4.0.0.dev7 → datahold-4.0.0.dev8}/src/datahold/__init__.py

@@ -16,6 +16,7 @@ __all__: list[str] = [
     "DataSet",
     "FrozenDataDict",
     "FrozenDataList",
+    "FrozenDataMapping",
     "FrozenDataSet",
 ]
 
@@ -106,6 +107,10 @@ class BaseDataCollection[Item](
         except TypeError:
             return other in (x for x in self.__fget__())  # type: ignore[operator]
 
+    @abstractmethod
+    @setdoc.basic
+    def __fget__(self: Self) -> Data[Item]: ...
+
     @setdoc.basic
     def __iter__(self: Self, /) -> abc.Iterator[Item]:
         return iter(self.__fget__())
@@ -114,10 +119,6 @@ class BaseDataCollection[Item](
     def __len__(self: Self, /) -> int:
         return len(self.__fget__())
 
-    @abstractmethod
-    @setdoc.basic
-    def __fget__(self: Self) -> Data[Item]: ...
-
 
 ### ABSTRACT SET ###
 
@@ -209,7 +210,10 @@ class DataSet[Item: abc.Hashable](
 
     @setdoc.basic
     def add(self: Self, item: Item, /) -> None:
-        self.__fset__(self.__fget__() | {item})
+        data: set[Item]
+        data = self.__fget__()
+        data.add(item)
+        self.__fset__(data)
 
     @setdoc.basic
     def copy(self: Self) -> Self:
@@ -221,10 +225,7 @@ class DataSet[Item: abc.Hashable](
         /,
         *others: abc.Iterable[abc.Hashable],
     ) -> None:
-        data: set[Item]
-        data = self.__fget__()
-        data.difference_update(*others)
-        self.__fset__(data)
+        self.__fset__(self.__fget__().difference(*others))
 
     @setdoc.basic
     def discard(self: Self, item: abc.Hashable, /) -> None:
@@ -237,19 +238,13 @@ class DataSet[Item: abc.Hashable](
     def intersection_update(
         self: Self, /, *others: abc.Iterable[abc.Hashable]
     ) -> None:
-        data: set[Item]
-        data = self.__fget__()
-        data.intersection_update(*others)
-        self.__fset__(data)
+        self.__fset__(self.__fget__().intersection(*others))
 
     @setdoc.basic
     def symmetric_difference_update(
         self: Self, other: abc.Iterable[Item], /
     ) -> None:
-        data: set[Item]
-        data = self.__fget__()
-        data.symmetric_difference_update(other)
-        self.__fset__(data)
+        self.__fset__(self.__fget__().symmetric_difference(other))
 
     @setdoc.basic
     def update(self: Self, /, *others: abc.Iterable[Item]) -> None:
@@ -257,7 +252,7 @@ class DataSet[Item: abc.Hashable](
 
 
 ### MAPPING ###
-class BaseDataMapping[Key, Value](
+class BaseDataMapping[Key: abc.Hashable, Value](
     BaseDataCollection[Key], abc.Mapping[Key, Value]
 ):
     """Provide an easy abc for a custom mapping."""
@@ -270,8 +265,11 @@ class BaseDataMapping[Key, Value](
         Protocol,
     ):
         @setdoc.basic
-        def __getitem__(self: Self, key: Never, /) -> DataValue:
-            pass
+        def __getitem__(self: Self, key: Never, /) -> DataValue: ...
+
+    @abstractmethod
+    @setdoc.basic
+    def __fget__(self: Self) -> Data[Key, Value]: ...
 
     @setdoc.basic
     def __getitem__(self: Self, key: object, /) -> Value:
@@ -280,9 +278,18 @@ class BaseDataMapping[Key, Value](
         except TypeError:
             raise KeyError(key) from None
 
-    @abstractmethod
+
+class FrozenDataMapping[Key: abc.Hashable, Value](
+    BaseDataMapping[Key, Value],
+    abc.Hashable,
+):
+    """Provide an easy abc for a custom frozen mapping."""
+
+    __slots__ = ()
+
     @setdoc.basic
-    def __fget__(self: Self) -> Data[Key, Value]: ...
+    def __hash__(self: Self) -> int:
+        return hash(frozendict(self.items()))
 
 
 ### DICT ###
@@ -350,16 +357,12 @@ class BaseDataDict[Key: abc.Hashable, Value](
 
 class FrozenDataDict[Key: abc.Hashable, Value](
     BaseDataDict[Key, Value],
-    abc.Hashable,
+    FrozenDataMapping[Key | str, Optional[Value]],
 ):
     """Provide easy abc for custom frozen dict-like."""
 
     __slots__ = ()
 
-    @setdoc.basic
-    def __hash__(self: Self) -> int:
-        return hash(frozendict(self.__fget__()))
-
 
 class DataDict[Key: abc.Hashable, Value](
     BaseDataDict[Key, Value],
@@ -434,6 +437,10 @@ class BaseDataSequence[Item](
             self: Self, key: int | Slice[int], /
         ) -> DataItem | abc.Sequence[DataItem]: ...
 
+    @abstractmethod
+    @setdoc.basic
+    def __fget__(self: Self) -> Data[Item]: ...
+
     @overload
     @setdoc.basic
     def __getitem__(self: Self, key: int, /) -> Item: ...
@@ -446,10 +453,6 @@ class BaseDataSequence[Item](
     ) -> Item | abc.Sequence[Item]:
         return self.__fget__()[key]
 
-    @abstractmethod
-    @setdoc.basic
-    def __fget__(self: Self) -> Data[Item]: ...
-
 
 ### LIST ###
 

{datahold-4.0.0.dev7 → datahold-4.0.0.dev8}/src/datahold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datahold
-Version: 4.0.0.dev7
+Version: 4.0.0.dev8
 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.dev7 → datahold-4.0.0.dev8}/tests/testdata.toml

@@ -115,6 +115,8 @@ dirData = []
 isabstract = true
 
 [types.FrozenDataDict.parents]
+BaseDataDict = true
+FrozenDataMapping = true
 
 [types.FrozenDataList]
 Data = "tuple"
@@ -123,6 +125,13 @@ isabstract = true
 
 [types.FrozenDataList.parents]
 
+[types.FrozenDataMapping]
+dirData = []
+
+[types.FrozenDataMapping.parents]
+BaseDataMapping = true
+Hashable = true
+
 [types.FrozenDataSet]
 Data = "frozenset"
 dirData = []