datahold 4.0.0.dev25__tar.gz → 4.0.0.dev26__tar.gz

{datahold-4.0.0.dev25 → datahold-4.0.0.dev26}/PKG-INFO

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

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

{datahold-4.0.0.dev25 → datahold-4.0.0.dev26}/src/datahold/__init__.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 __all__: list[str] = [
     "Collection",
     "DictLike",
-    "DictSlot",
     "FrozenDictLike",
     "FrozenDictSlot",
     "FrozenListLike",
@@ -13,7 +12,6 @@ __all__: list[str] = [
     "FrozenSetLike",
     "FrozenSetSlot",
     "ListLike",
-    "ListSlot",
     "Mapping",
     "MutableDictLike",
     "MutableDictSlot",
@@ -27,7 +25,6 @@ __all__: list[str] = [
     "Sequence",
     "Set",
     "SetLike",
-    "SetSlot",
 ]
 
 from abc import abstractmethod
@@ -338,32 +335,28 @@ class MutableSetLike[Item: abc.Hashable](SetLike[Item], MutableSet[Item]):
 ### SET-SLOT ###
 
 
-class SetSlot[Item: abc.Hashable](SetLike[Item]):
-    """Provide slotted set-like."""
+class FrozenSetSlot[Item](FrozenSetLike[Item]):
+    """Provide slotted frozen set-like."""
 
     __slots__ = ("_slot",)
 
-    _slot: SetSlot.__Frozen__[Item]
+    _slot: FrozenSetSlot.__Frozen__[Item]
 
     @setdoc.basic
-    def __frozen__(self: Self, /) -> SetSlot.__Frozen__[Item]:
+    def __frozen__(self: Self, /) -> FrozenSetSlot.__Frozen__[Item]:
         return self._slot
 
-
-class FrozenSetSlot[Item](SetSlot[Item], FrozenSetLike[Item]):
-    """Provide slotted frozen set-like."""
-
-    __slots__ = ()
-
     @setdoc.basic
     def __init__(self: Self, data: abc.Iterable[Item] = (), /) -> None:
         self._slot = frozenset(data)
 
 
-class MutableSetSlot[Item](SetSlot[Item], MutableSetLike[Item]):
+class MutableSetSlot[Item](MutableSetLike[Item]):
     """Provide slotted mutable set-like."""
 
-    __slots__ = ()
+    __slots__ = ("_slot",)
+
+    _slot: FrozenSetSlot.__Frozen__[Item]
 
     @contextmanager
     @setdoc.basic
@@ -433,9 +426,7 @@ class DictLike[Key: abc.Hashable, Value](
     """Provide abc for custom dict-like."""
 
     __slots__ = ()
-    type __Frozen__[FrozenKey, FrozenValue] = frozendict[
-        FrozenKey | str, Optional[FrozenValue]
-    ]
+    type __Frozen__[Key_, Value_] = frozendict[Key_ | str, Optional[Value_]]
 
     @abstractmethod
     @setdoc.basic
@@ -538,27 +529,20 @@ class MutableDictLike[Key: abc.Hashable, Value](
 ### DICT-SLOT ###
 
 
-class DictSlot[Key: abc.Hashable, Value](DictLike[Key, Value]):
-    """Provide slotted dict-like."""
+class FrozenDictSlot[Key: abc.Hashable, Value](
+    FrozenDictLike[Key, Value],
+):
+    """Provide slotted frozen dict-like."""
 
     __slots__ = ("_slot",)
-    _slot: DictSlot.__Frozen__[Key, Value]
+    _slot: FrozenDictSlot.__Frozen__[Key, Value]
 
     @setdoc.basic
     def __frozen__(  # type: ignore[override]
         self: Self,
-    ) -> DictSlot.__Frozen__[Key, Value]:
+    ) -> FrozenDictSlot.__Frozen__[Key, Value]:
         return self._slot
 
-
-class FrozenDictSlot[Key: abc.Hashable, Value](
-    DictSlot[Key, Value],
-    FrozenDictLike[Key, Value],
-):
-    """Provide slotted frozen dict-like."""
-
-    __slots__ = ()
-
     @setdoc.basic
     def __init__(
         self: Self,
@@ -566,16 +550,16 @@ class FrozenDictSlot[Key: abc.Hashable, Value](
         /,
         **kwargs: Optional[Value],
     ) -> None:
-        self._slot = frozendict(data)  # type: ignore[arg-type]
+        self._slot = frozendict(data, **kwargs)  # type: ignore[arg-type]
 
 
 class MutableDictSlot[Key: abc.Hashable, Value](
-    DictSlot[Key, Value],
     MutableDictLike[Key, Value],
 ):
     """Provide slotted mutable dict-like."""
 
-    __slots__ = ()
+    __slots__ = ("_slot",)
+    _slot: FrozenDictSlot.__Frozen__[Key, Value]
 
     @contextmanager
     @setdoc.basic
@@ -860,31 +844,26 @@ class MutableListLike[Item](ListLike[Item], MutableSequence[Item]):
 ### LIST-SLOT ###
 
 
-class ListSlot[Item](ListLike[Item]):
-    """Provide slotted list-like class."""
+class FrozenListSlot[Item](FrozenListLike[Item]):
+    """Provide slotted frozen list-like."""
 
     __slots__ = ("_slot",)
-    _slot: ListSlot.__Frozen__[Item]
+    _slot: FrozenListSlot.__Frozen__[Item]
 
     @setdoc.basic
-    def __frozen__(self: Self) -> ListSlot.__Frozen__[Item]:
+    def __frozen__(self: Self) -> FrozenListSlot.__Frozen__[Item]:
         return self._slot
 
-
-class FrozenListSlot[Item](ListSlot[Item], FrozenListLike[Item]):
-    """Provide slotted frozen list-like."""
-
-    __slots__ = ()
-
     @setdoc.basic
     def __init__(self: Self, data: abc.Iterable[Item] = (), /) -> None:
         self._slot = tuple(data)
 
 
-class MutableListSlot[Item](ListSlot[Item], MutableListLike[Item]):
+class MutableListSlot[Item](MutableListLike[Item]):
     """Provide slotted mutable list-like."""
 
-    __slots__ = ()
+    __slots__ = ("_slot",)
+    _slot: MutableListSlot.__Frozen__[Item]
 
     @contextmanager
     @setdoc.basic

{datahold-4.0.0.dev25 → datahold-4.0.0.dev26}/src/datahold.egg-info/PKG-INFO

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

@@ -20,6 +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_MutableDictSlot.py
 tests/test_MutableListSlot.py
 tests/test_abstractmethods.py
 tests/test_all.py

{datahold-4.0.0.dev25 → datahold-4.0.0.dev26}/tests/test_name.py

@@ -40,17 +40,15 @@ class TestName(unittest.TestCase):
             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:]))
-            )
+            ancestor = getattr(datahold, name[6:], object)
+            self.assertTrue(issubclass(datatype, ancestor))
         # 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:]))
-            )
+            ancestor = getattr(datahold, name[7:], object)
+            self.assertTrue(issubclass(datatype, ancestor))
         # no prefix
         if prefix == "":
             self.assertIn(datatype.__hash__, [None, object.__hash__])
@@ -62,11 +60,8 @@ class TestName(unittest.TestCase):
         # slot
         if suffix == "Slot":
             self.assertTrue(hasattr(datatype, "__init__"))
-            self.assertTrue(
-                issubclass(
-                    datatype, Lazy.get_import("datahold." + name[:-4] + "Like")
-                )
-            )
+            ancestor = getattr(datahold, name[:-4] + "Like")
+            self.assertTrue(issubclass(datatype, ancestor))
         # no suffix
         if suffix == "":
             self.assertIs(datatype.__init__, object.__init__)

{datahold-4.0.0.dev25 → datahold-4.0.0.dev26}/tests/test_variance.py

@@ -2,7 +2,7 @@
 
 import unittest
 
-from datahold import FrozenListLike, FrozenListSlot, ListLike, ListSlot
+from datahold import FrozenListLike, FrozenListSlot, ListLike
 
 
 class Animal:
@@ -26,12 +26,6 @@ def cast_FrozenListLikeAnimal(
     return x
 
 
-def cast_ListSlotAnimal(
-    x: ListSlot[Bear],
-) -> ListSlot[Animal]:
-    return x
-
-
 def cast_FrozenListSlotAnimal(
     x: FrozenListSlot[Bear],
 ) -> FrozenListSlot[Animal]:

{datahold-4.0.0.dev25 → datahold-4.0.0.dev26}/tests/testdata.toml

@@ -7,10 +7,6 @@ __or__ = "datahold.DictLike"
 "collections.abc.Mapping" = true
 "datahold.Mapping" = true
 
-[datatypes.DictSlot.issubclass]
-"collections.abc.Mapping" = true
-"datahold.DictLike" = true
-
 [datatypes.FrozenDictLike.issubclass]
 "collections.abc.Hashable" = true
 "datahold.Mapping" = true
@@ -182,13 +178,6 @@ __Mutable__ = ""
 [datatypes.ListLike.varia]
 generic = 1
 
-[datatypes.ListSlot.nested]
-__Frozen__ = "builtins.tuple"
-__Mutable__ = ""
-
-[datatypes.ListSlot.varia]
-generic = 1
-
 [datatypes.Mapping.issubclass]
 "collections.abc.Mapping" = true
 "datahold.Collection" = true
@@ -288,7 +277,6 @@ sort = ""
 "datahold.Collection" = true
 "datahold.MutableSet" = true
 "datahold.MutableSetLike" = true
-"datahold.SetSlot" = true
 
 [datatypes.Sequence]
 
@@ -302,9 +290,4 @@ sort = ""
 "datahold.Set" = true
 "datahold.SetLike" = true
 
-[datatypes.SetSlot.issubclass]
-"collections.abc.Set" = true
-"datahold.Collection" = true
-"datahold.SetLike" = true
-
 [non_datatypes]