datahold 4.0.0.dev4__tar.gz → 4.0.0.dev6__tar.gz

{datahold-4.0.0.dev4 → datahold-4.0.0.dev6}/PKG-INFO

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

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

{datahold-4.0.0.dev4 → datahold-4.0.0.dev6}/src/datahold/__init__.py

@@ -134,15 +134,19 @@ class BaseDataSet[Item: abc.Hashable](BaseDataAbstractSet[Item]):
 
     @abstractmethod
     @setdoc.basic
-    def __init__(self: Self, data: Init[Item] = (), /) -> None: ...
+    def __fget__(self: Self) -> Data[Item]: ...
 
+    @abstractmethod
     @setdoc.basic
-    def __repr__(self: Self, /) -> str:
-        return f"{type(self).__name__}({set(self.__fget__())!r})"
+    def __fset__(self: Self, data: Data[Item], /) -> None: ...
+
+    @setdoc.basic
+    def __init__(self: Self, data: Init[Item] = (), /) -> None:
+        self.__fset__(set(data))
 
-    @abstractmethod
     @setdoc.basic
-    def __fget__(self: Self) -> set[Item]: ...
+    def __repr__(self: Self, /) -> str:
+        return f"{type(self).__name__}({set(self.__fget__())!r})"
 
     @setdoc.basic
     def difference(self: Self, /, *others: abc.Iterable[abc.Hashable]) -> Self:
@@ -201,10 +205,6 @@ class FrozenHoldSet[Item: abc.Hashable](
     def __fset__(self: Self, data: FrozenHoldSet.Data[Item], /) -> None:
         self._data: FrozenHoldSet.Data[Item] = data
 
-    @setdoc.basic
-    def __init__(self: Self, data: FrozenHoldSet.Init[Item] = (), /) -> None:
-        self.__fset__(set(data))
-
 
 class DataSet[Item: abc.Hashable](
     BaseDataSet[Item],
@@ -214,22 +214,6 @@ class DataSet[Item: abc.Hashable](
 
     __slots__ = ()
 
-    @abstractmethod
-    @setdoc.basic
-    def __fget__(self: Self) -> DataSet.Data[Item]: ...
-
-    @abstractmethod
-    @setdoc.basic
-    def __fset__(
-        self: Self,
-        value: DataSet.Data[Item],
-        /,
-    ) -> None: ...
-
-    @setdoc.basic
-    def __init__(self: Self, data: abc.Iterable[Item] = (), /) -> None:
-        self.__fset__(set(data))
-
     @setdoc.basic
     def add(self: Self, item: Item, /) -> None:
         self.__fset__(self.__fget__() | {item})
@@ -342,13 +326,26 @@ class BaseDataDict[Key: abc.Hashable, Value](
     )
 
     @abstractmethod
+    @setdoc.basic
+    def __fget__(self: Self) -> Data[Key, Value]: ...
+
+    @abstractmethod
+    @setdoc.basic
+    def __fset__(self: Self, data: Data[Key, Value], /) -> None: ...
+
     @setdoc.basic
     def __init__(
         self: Self,
         data: Init[Key, Value] = (),
         /,
         **kwargs: Optional[Value],
-    ) -> None: ...
+    ) -> None:
+        data_: BaseDataDict.Data[Key, Value]
+        data_ = dict(  # type: ignore[assignment]
+            data,  # type: ignore[arg-type]
+            **kwargs,
+        )
+        self.__fset__(data_)
 
     @setdoc.basic
     def __or__(
@@ -364,10 +361,6 @@ class BaseDataDict[Key: abc.Hashable, Value](
 
     # __ror__ is unnecessary because of how __or__ is defined
 
-    @abstractmethod
-    @setdoc.basic
-    def __fget__(self: Self) -> Data[Key, Value]: ...
-
     @classmethod
     @setdoc.basic
     def fromkeys(
@@ -400,20 +393,6 @@ class FrozenHoldDict[Key: abc.Hashable, Value](
 
     __slots__ = ()
 
-    @setdoc.basic
-    def __init__(
-        self: Self,
-        data: FrozenHoldDict.Init[Key, Value] = (),
-        /,
-        **kwargs: Optional[Value],
-    ) -> None:
-        self.__fset__(
-            dict(
-                data,  # type: ignore[arg-type]
-                **kwargs,
-            )
-        )
-
     @setdoc.basic
     def __fget__(self: Self) -> FrozenHoldDict.Data[Key, Value]:
         return dict(self._data)
@@ -438,28 +417,6 @@ class DataDict[Key: abc.Hashable, Value](
         del data[key]
         self.__fset__(data)
 
-    @abstractmethod
-    @setdoc.basic
-    def __fget__(self: Self) -> DataDict.Data[Key, Value]: ...
-
-    @abstractmethod
-    @setdoc.basic
-    def __fset__(self: Self, data: DataDict.Data[Key, Value], /) -> None: ...
-
-    @setdoc.basic
-    def __init__(
-        self: Self,
-        data: BaseDataDict.Init[Key, Value] = (),
-        /,
-        **kwargs: Optional[Value],
-    ) -> None:
-        self.__fset__(
-            dict(
-                data,  # type: ignore[arg-type]
-                **kwargs,
-            )
-        )
-
     @setdoc.basic
     def __ior__(
         self: Self,
@@ -589,6 +546,14 @@ class BaseDataList[Item](BaseDataSequence[Item]):
         else:
             return NotImplemented
 
+    @abstractmethod
+    @setdoc.basic
+    def __fget__(self: Self) -> Data[Item]: ...
+
+    @abstractmethod
+    @setdoc.basic
+    def __fset__(self: Self, data: Data[Item], /) -> None: ...
+
     @setdoc.basic
     def __ge__(self: Self, other: object, /) -> NotImplementedType | bool:
         if isinstance(other, BaseDataList):
@@ -620,9 +585,9 @@ class BaseDataList[Item](BaseDataSequence[Item]):
         else:
             return NotImplemented
 
-    @abstractmethod
     @setdoc.basic
-    def __init__(self: Self, data: Init[Item] = (), /) -> None: ...
+    def __init__(self: Self, data: Init[Item] = (), /) -> None:
+        self.__fset__(list(data))
 
     @setdoc.basic
     def __le__(self: Self, other: object, /) -> NotImplementedType | bool:
@@ -648,10 +613,6 @@ class BaseDataList[Item](BaseDataSequence[Item]):
 
     __rmul__ = __mul__
 
-    @abstractmethod
-    @setdoc.basic
-    def __fget__(self: Self) -> Data[Item]: ...
-
 
 class FrozenDataList[Item](
     BaseDataList[Item],
@@ -682,10 +643,6 @@ class FrozenHoldList[Item](
     def __fset__(self: Self, data: FrozenHoldList.Data[Item], /) -> None:
         self._data: FrozenHoldList.Data[Item] = data
 
-    @setdoc.basic
-    def __init__(self: Self, data: FrozenHoldList.Init[Item] = (), /) -> None:
-        self.__fset__(list(data))
-
 
 class DataList[Item](
     BaseDataList[Item],
@@ -704,31 +661,11 @@ class DataList[Item](
         del data[other]
         self.__fset__(data)
 
-    @abstractmethod
-    @setdoc.basic
-    def __fget__(self: Self) -> DataList.Data[Item]: ...
-
-    @abstractmethod
-    @setdoc.basic
-    def __fset__(
-        self: Self,
-        value: DataList.Data[Item],
-        /,
-    ) -> None: ...
-
     @setdoc.basic
     def __imul__(self: Self, other: SupportsIndex, /) -> Self:
         self.__fset__(self.__fget__() * other)
         return self
 
-    @setdoc.basic
-    def __init__(
-        self: Self,
-        data: abc.Iterable[Item] = (),
-        /,
-    ) -> None:
-        self.__fset__(list(data))
-
     @overload
     @setdoc.basic
     def __setitem__(

{datahold-4.0.0.dev4 → datahold-4.0.0.dev6}/src/datahold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datahold
-Version: 4.0.0.dev4
+Version: 4.0.0.dev6
 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.dev4 → datahold-4.0.0.dev6}/tests/test_testdata.py

@@ -3,6 +3,7 @@ __all__: list[str] = [
     "TestCollection",
     "TestConstructor",
     "TestData",
+    "TestDirData",
     "TestGeneric",
     "TestHasCopy",
     "TestParents",
@@ -169,6 +170,40 @@ class TestData(unittest.TestCase):
             obj.foo = 42
 
 
+class TestDirData(unittest.TestCase):
+    def go_dirData(self: Self, x: Any, /, **y: Any) -> None:
+        cls = getattr(datahold, x)
+        dirData = y.get("dirData")
+        if dirData is None:
+            return
+        for z in dirData:
+            self.assertTrue(hasattr(cls.Data, z))
+
+    def go_init(self: Self, x: str, /) -> None:
+        cls: Any
+        cls = getattr(datahold, x)
+        self.assertEqual(
+            "__fget__" in cls.__dict__,
+            "Data" in cls.__dict__ or not ins.isabstract(cls),
+        )
+        if "__fset__" in cls.__dict__:
+            self.assertIn("__fget__", cls.__dict__)
+        self.assertEqual(
+            "Init" in cls.__dict__,
+            "__init__" in cls.__dict__,
+        )
+        self.assertNotEqual(
+            hasattr(cls, "Init"),
+            cls.__init__ is object.__init__,
+        )
+
+    def test_types(self: Self) -> None:
+        for x, y in Lazy.lazy.types.items():
+            with self.subTest(type=x):
+                self.go_dirData(x, **y)
+                self.go_init(x)
+
+
 class TestGeneric(unittest.TestCase):
     def go_assert_is_generic(
         self: Self,

{datahold-4.0.0.dev4 → datahold-4.0.0.dev6}/tests/testdata.toml

@@ -4,40 +4,73 @@ METHODS = [
     "__str__",
 ]
 
+[types.BaseDataAbstractSet]
+dirData = [
+    "__contains__",
+    "__iter__",
+    "__len__",
+]
+
 [types.BaseDataAbstractSet.parents]
 BaseDataCollection = true
 Hashable = false
 
+[types.BaseDataCollection]
+dirData = [
+    "__contains__",
+    "__iter__",
+    "__len__",
+]
+
 [types.BaseDataCollection.parents]
 Collection = true
 Hashable = true
 
+[types.BaseDataDict]
+dirData = []
+
 [types.BaseDataDict.parents]
 Hashable = false
 Mapping = true
 
+[types.BaseDataList]
+dirData = []
+
 [types.BaseDataList.parents]
 Hashable = false
 Sequence = true
 
+[types.BaseDataMapping]
+dirData = []
+
 [types.BaseDataMapping.parents]
 BaseDataCollection = true
 Hashable = false
 
+[types.BaseDataSequence]
+dirData = []
+
 [types.BaseDataSequence.parents]
 BaseDataCollection = true
 Hashable = true
 
+[types.BaseDataSet]
+dirData = []
+
 [types.BaseDataSet.parents]
 Hashable = false
 Set = true
 
+[types.BaseHoldCollection]
+dirData = []
+
 [types.BaseHoldCollection.parents]
 BaseDataCollection = true
 Hashable = true
 
 [types.DataDict]
 Data = "frozendict"
+dirData = []
 isabstract = true
 n_type_params = 2
 
@@ -50,6 +83,7 @@ MutableMapping = true
 
 [types.DataList]
 Data = "tuple"
+dirData = []
 isabstract = true
 n_type_params = 1
 
@@ -63,6 +97,7 @@ Sequence = true
 
 [types.DataSet]
 Data = "frozenset"
+dirData = []
 isabstract = true
 n_type_params = 1
 
@@ -76,22 +111,28 @@ Set = true
 
 [types.FrozenDataDict]
 Data = "frozendict"
+dirData = []
 isabstract = true
 
 [types.FrozenDataDict.parents]
 
 [types.FrozenDataList]
 Data = "tuple"
+dirData = []
 isabstract = true
 
 [types.FrozenDataList.parents]
 
 [types.FrozenDataSet]
 Data = "frozenset"
+dirData = []
 isabstract = true
 
 [types.FrozenDataSet.parents]
 
+[types.FrozenHoldDict]
+dirData = []
+
 [types.FrozenHoldDict.constructor.concrete]
 args = [
     { a = 1 },
@@ -104,6 +145,9 @@ a = 1
 Mapping = true
 MutableMapping = false
 
+[types.FrozenHoldList]
+dirData = []
+
 [types.FrozenHoldList.constructor.concrete]
 args = [
     [
@@ -118,6 +162,9 @@ FrozenDataList = true
 MutableSequence = false
 Sequence = true
 
+[types.FrozenHoldSet]
+dirData = []
+
 [types.FrozenHoldSet.constructor.concrete]
 args = [
     [
@@ -133,6 +180,7 @@ Set = true
 
 [types.HoldDict]
 Data = "frozendict"
+dirData = []
 n_type_params = 2
 
 [types.HoldDict.constructor.concrete.kwargs]
@@ -149,6 +197,7 @@ MutableMapping = true
 
 [types.HoldList]
 Data = "tuple"
+dirData = []
 n_type_params = 1
 
 [types.HoldList.constructor.empty]
@@ -178,6 +227,7 @@ Sequence = true
 
 [types.HoldSet]
 Date = "frozenset"
+dirData = []
 n_type_params = 1
 
 [types.HoldSet.constructor.empty]