datahold 4.0.0.dev22__tar.gz → 4.0.0.dev24__tar.gz

{datahold-4.0.0.dev22 → datahold-4.0.0.dev24}/PKG-INFO

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

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

{datahold-4.0.0.dev22 → datahold-4.0.0.dev24}/src/datahold/__init__.py

@@ -86,6 +86,15 @@ type Slice[Index] = slice[Optional[Index], Optional[Index], Optional[Index]]
 ### COLLECTION ###
 
 
+class Collection_Frozen[Item](
+    abc.Sized,
+    abc.Iterable[Item],
+    Protocol,
+):
+    @setdoc.basic
+    def __contains__(self: Self, other: Never, /) -> bool: ...
+
+
 class Collection[Item](
     abc.Sized,
     abc.Iterable[Item],
@@ -93,14 +102,7 @@ class Collection[Item](
 ):
     """Provide abc for custom collection."""
 
-    @setdoc.basic
-    class __Frozen__[Item_](
-        abc.Sized,
-        abc.Iterable[Item_],
-        Protocol,
-    ):
-        @setdoc.basic
-        def __contains__(self: Self, other: Never, /) -> bool: ...
+    type __Frozen__[Item_] = Collection_Frozen[Item_]
 
     @setdoc.basic
     def __contains__(self: Self, other: object, /) -> bool:
@@ -111,10 +113,10 @@ class Collection[Item](
 
     @abstractmethod
     @setdoc.basic
-    def __frozen__(self: Self, /) -> __Frozen__[Item]: ...
+    def __frozen__(self: Self, /) -> Collection_Frozen[Item]: ...
 
     @setdoc.basic
-    def __iter__(self: Self) -> abc.Iterator[Item]:
+    def __iter__(self: Self, /) -> abc.Iterator[Item]:
         return iter(self.__frozen__())
 
     @setdoc.basic
@@ -131,20 +133,20 @@ class Set[Item: abc.Hashable](Collection[Item], abc.Set[Item]):
     __slots__ = ()
 
 
+class MutableSet_Mutable[Item: abc.Hashable](Protocol):
+    @setdoc.basic
+    def add(self: Self, item: Item, /) -> object: ...
+    @setdoc.basic
+    def discard(self: Self, item: abc.Hashable, /) -> object: ...
 class MutableSet[Item: abc.Hashable](Set[Item], abc.MutableSet[Item]):
     """Provide abc for custom mutable set."""
 
     __slots__ = ()
+    type __Mutable__[Item_] = MutableSet_Mutable[Item_]
 
-    @setdoc.basic
-    class __Mutable__[Item_: abc.Hashable](Protocol):
-        @setdoc.basic
-        def add(self: Self, item: Item_, /) -> object: ...
-        @setdoc.basic
-        def discard(self: Self, item: abc.Hashable, /) -> object: ...
     @abstractmethod
     @setdoc.basic
-    def __mutate__(self: Self) -> ContextManager[__Mutable__[Item]]: ...
+    def __mutate__(self: Self) -> ContextManager[MutableSet_Mutable[Item]]: ...
     @setdoc.basic
     def add(self: Self, item: Item, /) -> None:
         with self.__mutate__() as mutable:
@@ -204,7 +206,7 @@ class FrozenSetLike[Item: abc.Hashable](SetLike[Item], abc.Hashable):
     __slots__ = ()
 
     @setdoc.basic
-    def __hash__(self: Self) -> int:
+    def __hash__(self: Self, /) -> int:
         return hash(self.__frozen__())
 
 
@@ -219,7 +221,6 @@ class MutableSetLike[Item: abc.Hashable](SetLike[Item], MutableSet[Item]):
         with self.__mutate__() as mutable:
             return frozenset(mutable)
 
-    @abstractmethod
     @setdoc.basic
     def __init__(self: Self, data: abc.Iterable[Item] = (), /) -> None:
         with self.__mutate__() as mutable:
@@ -266,7 +267,7 @@ class SetSlot[Item: abc.Hashable](SetLike[Item]):
     _slot: SetSlot.__Frozen__[Item]
 
     @setdoc.basic
-    def __frozen__(self: Self) -> SetSlot.__Frozen__[Item]:
+    def __frozen__(self: Self, /) -> SetSlot.__Frozen__[Item]:
         return self._slot
 
 
@@ -287,7 +288,11 @@ class MutableSetSlot[Item](SetSlot[Item], MutableSetLike[Item]):
 
     @contextmanager
     @setdoc.basic
-    def __mutate__(self: Self, /) -> abc.Generator[set[Item], None, None]:
+    def __mutate__(
+        self: Self,
+        /,
+    ) -> abc.Generator[MutableSetSlot.__Mutable__[Item], None, None]:
+        slot: MutableSetSlot.__Mutable__[Item]
         slot = set(getattr(self, "_slot", ()))
         yield slot
         self._slot = frozenset(slot)
@@ -296,6 +301,9 @@ class MutableSetSlot[Item](SetSlot[Item], MutableSetLike[Item]):
 ### MAPPING ###
 
 
+class Mapping_Frozen[Key, Value](Collection_Frozen[Key], Protocol):
+    @setdoc.basic
+    def __getitem__(self: Self, key: abc.Hashable, /) -> Value: ...
 class Mapping[Key: abc.Hashable, Value](
     Collection[Key],
     abc.Mapping[Key, Value],
@@ -304,12 +312,8 @@ class Mapping[Key: abc.Hashable, Value](
 
     __slots__ = ()
 
-    @setdoc.basic
-    class __Frozen__[FrozenKey, FrozenValue](
-        Collection.__Frozen__[FrozenKey], Protocol
-    ):
-        @setdoc.basic
-        def __getitem__(self: Self, key: abc.Hashable, /) -> FrozenValue: ...
+    type __Frozen__[Key_, Value_] = Mapping_Frozen[Key_, Value_]
+
     @abstractmethod
     @setdoc.basic
     def __frozen__(self: Self, /) -> __Frozen__[Key, Value]: ...
@@ -318,6 +322,15 @@ class Mapping[Key: abc.Hashable, Value](
         return self.__frozen__()[key]
 
 
+class MutableMapping_Mutable[Key_, Value_](
+    Protocol,
+):
+    @setdoc.basic
+    def __delitem__(self: Self, key: Key_ | str, /) -> object: ...
+    @setdoc.basic
+    def __setitem__(
+        self: Self, key: Key_ | str, value: Optional[Value_], /
+    ) -> object: ...
 class MutableMapping[Key: abc.Hashable, Value](
     Mapping[Key, Value],
     abc.MutableMapping[Key | str, Optional[Value]],
@@ -326,16 +339,7 @@ class MutableMapping[Key: abc.Hashable, Value](
 
     __slots__ = ()
 
-    @setdoc.basic
-    class __Mutable__[Key_, Value_](
-        Protocol,
-    ):
-        @setdoc.basic
-        def __delitem__(self: Self, key: Key_ | str, /) -> object: ...
-        @setdoc.basic
-        def __setitem__(
-            self: Self, key: Key_ | str, value: Optional[Value_], /
-        ) -> object: ...
+    type __Mutable__[Key_, Value_] = MutableMapping_Mutable[Key_, Value_]
 
     @setdoc.basic
     def __delitem__(self: Self, key: Key | str, /) -> None:
@@ -349,7 +353,8 @@ class MutableMapping[Key: abc.Hashable, Value](
     def __setitem__(
         self: Self, key: Key | str, value: Optional[Value], /
     ) -> None:
-        self[key] = value
+        with self.__mutate__() as mutable:
+            mutable[key] = value
 
 
 ### DICT-LIKE ###
@@ -396,7 +401,7 @@ class DictLike[Key: abc.Hashable, Value](
     def fromkeys(
         cls: type[Self],
         iterable: abc.Iterable[Key | str],
-        value: Optional[Value],
+        value: Optional[Value] = None,
         /,
     ) -> Self:
         return cls(dict.fromkeys(iterable, value))
@@ -520,30 +525,28 @@ class MutableDictSlot[Key: abc.Hashable, Value](
 ### SEQUENCE ###
 
 
+class Sequence_Frozen[Item](
+    Collection_Frozen[Item],
+    Protocol,
+):
+    @overload
+    @setdoc.basic
+    def __getitem__(self: Self, key: int, /) -> Item: ...
+    @overload
+    @setdoc.basic
+    def __getitem__(self: Self, key: Slice[int], /) -> abc.Sequence[Item]: ...
+    @setdoc.basic
+    def __getitem__(
+        self: Self,
+        key: int | Slice[int],
+        /,
+    ) -> Item | abc.Sequence[Item]: ...
 class Sequence[Item](Collection[Item], abc.Sequence[Item]):
     """Provide abc for customized sequence."""
 
     __slots__ = ()
+    type __Frozen__[Item_] = Sequence_Frozen[Item_]
 
-    @setdoc.basic
-    class __Frozen__[Item_](
-        Collection.__Frozen__[Item_],
-        Protocol,
-    ):
-        @overload
-        @setdoc.basic
-        def __getitem__(self: Self, key: int, /) -> Item_: ...
-        @overload
-        @setdoc.basic
-        def __getitem__(
-            self: Self, key: Slice[int], /
-        ) -> abc.Sequence[Item_]: ...
-        @setdoc.basic
-        def __getitem__(
-            self: Self,
-            key: int | Slice[int],
-            /,
-        ) -> Item_ | abc.Sequence[Item_]: ...
     @abstractmethod
     @setdoc.basic
     def __frozen__(self: Self, /) -> __Frozen__[Item]: ...
@@ -560,54 +563,55 @@ class Sequence[Item](Collection[Item], abc.Sequence[Item]):
         return self.__frozen__()[key]
 
 
+class MutableSequence_Mutable[Item](Protocol):
+    @overload
+    @setdoc.basic
+    def __delitem__(self: Self, key: SupportsIndex, /) -> None: ...
+    @overload
+    @setdoc.basic
+    def __delitem__(self: Self, key: Slice[SupportsIndex], /) -> None: ...
+    @setdoc.basic
+    def __delitem__(
+        self: Self, key: SupportsIndex | Slice[SupportsIndex], /
+    ) -> None: ...
+    @overload
+    @setdoc.basic
+    def __getitem__(self: Self, key: int, /) -> Item: ...
+    @overload
+    @setdoc.basic
+    def __getitem__(
+        self: Self, key: Slice[int], /
+    ) -> abc.MutableSequence[Item]: ...
+    @setdoc.basic
+    def __getitem__(
+        self: Self,
+        key: int | Slice[int],
+        /,
+    ) -> Item | abc.MutableSequence[Item]: ...
+    @overload
+    @setdoc.basic
+    def __setitem__(self: Self, key: int, value: Item, /) -> None: ...
+    @overload
+    @setdoc.basic
+    def __setitem__(
+        self: Self, key: Slice[int], value: abc.Iterable[Item], /
+    ) -> None: ...
+    @setdoc.basic
+    def __setitem__(
+        self: Self,
+        key: int | Slice[int],
+        value: Item | abc.Iterable[Item],
+        /,
+    ) -> None: ...
+    @setdoc.basic
+    def insert(self: Self, index: int, item: Item, /) -> None: ...
+
+
 class MutableSequence[Item](Sequence[Item], abc.MutableSequence[Item]):
     """Provide abc for custom mutable sequence."""
 
     __slots__ = ()
-
-    @setdoc.basic
-    class __Mutable__[Item_](Protocol):
-        @overload
-        @setdoc.basic
-        def __delitem__(self: Self, key: SupportsIndex, /) -> None: ...
-        @overload
-        @setdoc.basic
-        def __delitem__(self: Self, key: Slice[SupportsIndex], /) -> None: ...
-        @setdoc.basic
-        def __delitem__(
-            self: Self, key: SupportsIndex | Slice[SupportsIndex], /
-        ) -> None: ...
-        @overload
-        @setdoc.basic
-        def __getitem__(self: Self, key: int, /) -> Item_: ...
-        @overload
-        @setdoc.basic
-        def __getitem__(
-            self: Self, key: Slice[int], /
-        ) -> abc.MutableSequence[Item_]: ...
-        @setdoc.basic
-        def __getitem__(
-            self: Self,
-            key: int | Slice[int],
-            /,
-        ) -> Item_ | abc.MutableSequence[Item_]: ...
-        @overload
-        @setdoc.basic
-        def __setitem__(self: Self, key: int, value: Item_, /) -> None: ...
-        @overload
-        @setdoc.basic
-        def __setitem__(
-            self: Self, key: Slice[int], value: abc.Iterable[Item_], /
-        ) -> None: ...
-        @setdoc.basic
-        def __setitem__(
-            self: Self,
-            key: int | Slice[int],
-            value: Item_ | abc.Iterable[Item_],
-            /,
-        ) -> None: ...
-        @setdoc.basic
-        def insert(self: Self, index: int, item: Item_, /) -> None: ...
+    type __Mutable__[Item_] = MutableSequence_Mutable[Item_]
 
     @overload
     @setdoc.basic

{datahold-4.0.0.dev22 → datahold-4.0.0.dev24}/src/datahold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datahold
-Version: 4.0.0.dev22
+Version: 4.0.0.dev24
 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.dev22 → datahold-4.0.0.dev24}/src/datahold.egg-info/SOURCES.txt

@@ -20,7 +20,7 @@ src/datahold.egg-info/dependency_links.txt
 src/datahold.egg-info/requires.txt
 src/datahold.egg-info/top_level.txt
 tests/test_FrozenListSlot.py
-tests/test_MutableListHold.py
+tests/test_MutableListSlot.py
 tests/test_abstractmethods.py
 tests/test_all.py
 tests/test_attributes.py
@@ -28,8 +28,8 @@ tests/test_docs.py
 tests/test_generic.py
 tests/test_internal_comparison.py
 tests/test_issubclass.py
+tests/test_name.py
 tests/test_nested.py
-tests/test_prefix.py
 tests/test_sorted.py
 tests/test_variance.py
 tests/testdata.toml

{datahold-4.0.0.dev22 → datahold-4.0.0.dev24}/tests/test_abstractmethods.py

@@ -12,22 +12,18 @@ import datahold
 
 
 class TestAbstractmethods(unittest.TestCase):
-    def _test(
-        self: Self, name: str, abstractmethods: Optional[list[str]] = None, /
-    ) -> None:
+    def _test(self: Self, name: str, abstractmethods: set[str], /) -> None:
         datatype: Any
-        if abstractmethods is None:
-            return
         datatype = getattr(datahold, name)
-        self.assertSetEqual(datatype.__abstractmethods__, set(abstractmethods))
+        self.assertLessEqual(len(datatype.__abstractmethods__), 2)
+        self.assertSetEqual(datatype.__abstractmethods__, abstractmethods)
         self.assertEqual(ins.isabstract(datatype), bool(abstractmethods))
 
     def test_abstractmethods(self: Self, /) -> None:
-        data: Any
         name: Any
-        for name, data in Lazy.lazy.datatypes.items():
+        for name in Lazy.lazy.datatypes.keys():
             with self.subTest(datatype=name):
-                self._test(name, data.get("abstractmethods"))
+                self._test(name, Lazy.get_abstractmethods(name))
 
 
 if __name__ == "__main__":

datahold-4.0.0.dev24/tests/test_name.py

@@ -0,0 +1,81 @@
+from __future__ import annotations
+
+__all__: list[str] = ["TestName"]
+
+import unittest
+from collections import abc
+from typing import Self
+
+from Lazy import Lazy
+
+import datahold
+
+
+class TestName(unittest.TestCase):
+
+    def _test_name(self: Self, name: str, /) -> None:
+        prefix: str
+        suffix: str
+        if name.startswith("Frozen"):
+            prefix = "Frozen"
+        elif name.startswith("Mutable"):
+            prefix = "Mutable"
+        else:
+            prefix = ""
+        if name.endswith("Like"):
+            suffix = "Like"
+        elif name.endswith("Slot"):
+            suffix = "Slot"
+        else:
+            suffix = ""
+        # all
+        datatype = getattr(datahold, name)
+        self.assertEqual(datatype.__name__, name)
+        self.assertTrue(hasattr(datatype, "__Frozen__"))
+        self.assertTrue(hasattr(datatype, "__frozen__"))
+        self.assertTrue(issubclass(datatype, datahold.Collection))
+        # frozen
+        if prefix == "Frozen":
+            self.assertIsNot(datatype.__hash__, object.__hash__)
+            self.assertTrue(issubclass(datatype, abc.Hashable))
+            self.assertFalse(hasattr(datatype, "__Mutable__"))
+            self.assertFalse(hasattr(datatype, "__mutate__"))
+            self.assertTrue(
+                issubclass(datatype, Lazy.get_import("datahold." + name[6:]))
+            )
+        # mutable
+        if prefix == "Mutable":
+            self.assertIn(datatype.__hash__, [None, object.__hash__])
+            self.assertTrue(hasattr(datatype, "__Mutable__"))
+            self.assertTrue(hasattr(datatype, "__mutate__"))
+            self.assertTrue(
+                issubclass(datatype, Lazy.get_import("datahold." + name[7:]))
+            )
+        # no prefix
+        if prefix == "":
+            self.assertIn(datatype.__hash__, [None, object.__hash__])
+            self.assertFalse(hasattr(datatype, "__Mutable__"))
+            self.assertFalse(hasattr(datatype, "__mutate__"))
+        # like
+        if suffix == "Like":
+            self.assertTrue(hasattr(datatype, "__init__"))
+        # slot
+        if suffix == "Slot":
+            self.assertTrue(hasattr(datatype, "__init__"))
+            self.assertTrue(
+                issubclass(
+                    datatype, Lazy.get_import("datahold." + name[:-4] + "Like")
+                )
+            )
+        # no suffix
+        if suffix == "":
+            self.assertIs(datatype.__init__, object.__init__)
+
+    def test_name(self: Self, /) -> None:
+        for name in Lazy.lazy.datatypes.keys():
+            with self.subTest(datatype=name):
+                self._test_name(name)
+
+
+if __name__ == "__main__":
+    unittest.main(verbosity=2)

{datahold-4.0.0.dev22 → datahold-4.0.0.dev24}/tests/testdata.toml

@@ -1,5 +1,8 @@
 [datatypes.Collection]
 
+[datatypes.DictLike.attributes]
+__or__ = "datahold.DictLike"
+
 [datatypes.DictLike.issubclass]
 "collections.abc.Mapping" = true
 "datahold.Mapping" = true
@@ -16,12 +19,6 @@
 "collections.abc.Hashable" = true
 "datahold.FrozenDictLike" = true
 
-[datatypes.FrozenListLike]
-abstractmethods = [
-    "__frozen__",
-    "__init__",
-]
-
 [datatypes.FrozenListLike.attributes]
 __frozen__ = "datahold.ListLike"
 __init__ = "datahold.ListLike"
@@ -40,9 +37,6 @@ __Mutable__ = ""
 [datatypes.FrozenListLike.varia]
 generic = 1
 
-[datatypes.FrozenListSlot]
-abstractmethods = []
-
 [datatypes.FrozenListSlot.TestInternalComparsion.ge.test_greater_value]
 a = "_1_3"
 b = "_1_2"
@@ -166,12 +160,6 @@ generic = 1
 "collections.abc.Set" = true
 "datahold.Collection" = true
 
-[datatypes.ListLike]
-abstractmethods = [
-    "__frozen__",
-    "__init__",
-]
-
 [datatypes.ListLike.attributes]
 __frozen__ = "datahold.ListLike"
 __init__ = "datahold.ListLike"
@@ -194,11 +182,6 @@ __Mutable__ = ""
 [datatypes.ListLike.varia]
 generic = 1
 
-[datatypes.ListSlot]
-abstractmethods = [
-    "__init__",
-]
-
 [datatypes.ListSlot.nested]
 __Frozen__ = "builtins.tuple"
 __Mutable__ = ""
@@ -210,6 +193,10 @@ generic = 1
 "collections.abc.Mapping" = true
 "datahold.Collection" = true
 
+[datatypes.MutableDictLike.attributes]
+__ior__ = "datahold.MutableDictLike"
+__or__ = "datahold.DictLike"
+
 [datatypes.MutableDictLike.issubclass]
 "collections.abc.Mapping" = true
 "collections.abc.MutableMapping" = true
@@ -221,11 +208,6 @@ generic = 1
 "datahold.MutableDictLike" = true
 "datahold.MutableMapping" = true
 
-[datatypes.MutableListLike]
-abstractmethods = [
-    "__mutate__",
-]
-
 [datatypes.MutableListLike.attributes]
 __add__ = "datahold.MutableListLike"
 __frozen__ = "datahold.MutableListLike"
@@ -259,9 +241,6 @@ __hash__ = ""
 [datatypes.MutableListLike.varia]
 generic = 1
 
-[datatypes.MutableListSlot]
-abstractmethods = []
-
 [datatypes.MutableListSlot.issubclass]
 "builtins.list" = false
 "datahold.ListLike" = true
@@ -312,9 +291,6 @@ sort = ""
 "datahold.SetSlot" = true
 
 [datatypes.Sequence]
-abstractmethods = [
-    "__frozen__",
-]
 
 [datatypes.Set.issubclass]
 "collections.abc.Set" = true

datahold-4.0.0.dev22/tests/test_prefix.py

@@ -1,41 +0,0 @@
-from __future__ import annotations
-
-__all__: list[str] = ["TestPrefix"]
-
-import unittest
-from collections import abc
-from typing import Self
-
-from Lazy import Lazy
-
-import datahold
-
-
-class TestPrefix(unittest.TestCase):
-    def _test_prefix(self: Self, name: str, /) -> None:
-        datatype = getattr(datahold, name)
-        self.assertEqual(datatype.__name__, name)
-        self.assertTrue(hasattr(datatype, "__Frozen__"))
-        self.assertTrue(hasattr(datatype, "__frozen__"))
-        if name.startswith("Frozen"):
-            self.assertIsNot(datatype.__hash__, object.__hash__)
-            self.assertTrue(issubclass(datatype, abc.Hashable))
-            self.assertFalse(hasattr(datatype, "__Mutable__"))
-            self.assertFalse(hasattr(datatype, "__mutate__"))
-            return
-        self.assertIn(datatype.__hash__, [None, object.__hash__])
-        if name.startswith("Mutable"):
-            self.assertTrue(hasattr(datatype, "__Mutable__"))
-            self.assertTrue(hasattr(datatype, "__mutate__"))
-            return
-        self.assertFalse(hasattr(datatype, "__Mutable__"))
-        self.assertFalse(hasattr(datatype, "__mutate__"))
-
-    def test_prefix(self: Self, /) -> None:
-        for name in Lazy.lazy.datatypes.keys():
-            with self.subTest(datatype=name):
-                self._test_prefix(name)
-
-
-if __name__ == "__main__":
-    unittest.main(verbosity=2)