python-dictattr 0.0.1__tar.gz → 0.0.3__tar.gz

{python_dictattr-0.0.1 → python_dictattr-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-dictattr
-Version: 0.0.1
+Version: 0.0.3
 Summary: Python dictattr.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-dictattr
 License: MIT

python_dictattr-0.0.3/dictattr/__init__.py

@@ -0,0 +1,166 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+
+from __future__ import annotations
+
+__author__ = "ChenyangGao <https://chenyanggao.github.io>"
+__version__ = (0, 0, 3)
+__all__ = [
+    "odict", "AttrDict", "MapAttr", "MuMapAttr", 
+    "DictAttr", "ChainDictAttr", "UserDictAttr", 
+]
+
+from collections import UserDict
+from collections.abc import Iterator, Mapping, MutableMapping
+from typing import Generic, Self, TypeVar
+
+
+K = TypeVar("K")
+V = TypeVar("V")
+
+
+class odict(dict[K, V]):
+
+    __getattr__ = dict.__getitem__
+    __setattr__ = dict.__setitem__ # type: ignore
+    __delattr__ = dict.__delitem__ # type: ignore
+
+    def __hash__(self, /) -> int: # type: ignore
+        return id(self)
+
+    def __eq__(self, value, /) -> bool:
+        return self is value or super().__eq__(value)
+
+
+class AttrDict(dict[K, V]):
+
+    def __init__(self, /, *args, **kwds):
+        super().__init__(*args, **kwds)
+        self.__dict__ = self # type: ignore
+
+    def __hash__(self, /) -> int: # type: ignore
+        return id(self)
+
+    def __eq__(self, value, /) -> bool:
+        return self is value or super().__eq__(value)
+
+
+@Mapping.register
+class MapAttr(Generic[K, V]):
+
+    def __init__(self, /, *args, **kwds):
+        self.__dict__: dict[K, V] # type: ignore
+        self.__dict__.update(*args, **kwds)
+
+    def __contains__(self, key, /) -> bool:
+        return key in self.__dict__
+
+    def __getitem__(self, key, /) -> V:
+        return self.__dict__[key]
+
+    def __iter__(self, /) -> Iterator[K]:
+        return iter(self.__dict__)
+
+    def __len__(self, /) -> int:
+        return len(self.__dict__)
+
+    def __repr__(self, /) -> str:
+        cls = type(self)
+        if (mod := cls.__module__) == "__main__":
+            return f"{cls.__qualname__}({self.__dict__})"
+        else:
+            return f"{mod}.{cls.__qualname__}({self.__dict__})"
+
+    @classmethod
+    def of(
+        cls, 
+        d: None | dict[K, V] = None, 
+        /, 
+    ) -> Self:
+        if d is None:
+            return cls()
+        self = __class__.__new__(cls) # type: ignore
+        self.__dict__ = d
+        return self
+
+
+@MutableMapping.register
+class MuMapAttr(MapAttr[K, V]):
+
+    def __delitem__(self, key, /):
+        del self.__dict__[key]
+
+    def __setitem__(self, key: K, val: V, /):
+        self.__dict__[key] = val
+
+
+class DictAttr(MuMapAttr[K, V]):
+
+    def __getattr__(self, attr, /):
+        return getattr(self.__dict__, attr)
+
+    def __getattribute__(self, attr, /):
+        if attr == "__dict__":
+            return super().__getattribute__(attr)
+        try:
+            return self[attr]
+        except KeyError:
+            return super().__getattribute__(attr)
+
+    def __getitem__(self, key, /) -> V | Self: # type: ignore
+        d = self.__dict__[key]
+        if type(d) is dict:
+            return type(self)(d)
+        return d
+
+
+class ChainDictAttr(DictAttr[K, V | "ChainDictAttr"]):
+
+    def __getitem__(self, key, /) -> V | ChainDictAttr:
+        try:
+            return super().__getitem__(key)
+        except KeyError:
+            d = self.__dict__[key] = type(self)()
+            return d
+
+
+class UserDictAttr(UserDict[K, V]):
+
+    @classmethod
+    def of(cls, m: Mapping, /) -> Self:
+        self = cls()
+        self.__dict__["data"] = m # type: ignore
+        return self
+
+    def __delattr__(self, attr, /):
+        try:
+            del self[attr]
+        except KeyError:
+            try:
+                super().__delattr__(attr)
+            except KeyError:
+                raise AttributeError(attr)
+
+    def __getattr__(self, attr, /):
+        return getattr(self.data, attr)
+
+    def __getattribute__(self, attr, /):
+        if attr in ("__dict__", "data") or attr == f"__{attr.strip('_')}__":
+            return super().__getattribute__(attr)
+        try:
+            return self[attr]
+        except KeyError:
+            return super().__getattribute__(attr)
+
+    def __getitem__(self, key, /) -> V | Self: # type: ignore
+        d = super().__getitem__(key)
+        if type(d) is dict:
+            return type(self)(d)
+        return d
+
+    def __setattr__(self, attr, val, /):
+        if attr == "data" and "data" not in self.__dict__:
+            self.__dict__["data"] = val
+        else:
+            self[attr] = val
+

{python_dictattr-0.0.1 → python_dictattr-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-dictattr"
-version = "0.0.1"
+version = "0.0.3"
 description = "Python dictattr."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"

python_dictattr-0.0.1/dictattr/__init__.py

@@ -1,103 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf-8
-
-__author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 1)
-__all__ = [
-    "odict", "AttrDict", "MapAttr", "MuMapAttr", "DictAttr", "ChainDictAttr", 
-]
-
-from collections.abc import Iterator, Mapping, MutableMapping
-from typing import Generic, Self, TypeVar
-
-
-K = TypeVar("K")
-V = TypeVar("V")
-
-
-class odict(dict[K, V]):
-
-    __getattr__ = dict.__getitem__
-    __setattr__ = dict.__setitem__ # type: ignore
-    __delattr__ = dict.__delitem__ # type: ignore
-
-
-class AttrDict(dict[K, V]):
-
-    def __init__(self, /, *args, **kwds):
-        super().__init__(*args, **kwds)
-        self.__dict__ = self # type: ignore
-
-
-@Mapping.register
-class MapAttr(Generic[K, V]):
-
-    def __init__(self, d: None | dict = None, /):
-        self.__dict__: dict[K, V] # type: ignore
-        if d is not None:
-            self.__dict__ = d
-
-    def __contains__(self, key, /) -> bool:
-        return key in self.__dict__
-
-    def __getitem__(self, key, /) -> V:
-        return self.__dict__[key]
-
-    def __iter__(self, /) -> Iterator[K]:
-        return iter(self.__dict__)
-
-    def __len__(self, /) -> int:
-        return len(self.__dict__)
-
-    def __repr__(self, /) -> str:
-        cls = type(self)
-        if (mod := cls.__module__) == "__main__":
-            return f"{cls.__qualname__}({self.__dict__})"
-        else:
-            return f"{mod}.{cls.__qualname__}({self.__dict__})"
-
-    @classmethod
-    def of(cls, /, *args, **kwds) -> Self:
-        return cls(dict(*args, **kwds))
-
-
-@MutableMapping.register
-class MuMapAttr(MapAttr[K, V]):
-
-    def __delitem__(self, key, /):
-        del self.__dict__[key]
-
-    def __setitem__(self, key: K, val: V, /):
-        self.__dict__[key] = val
-
-
-class DictAttr(MuMapAttr):
-
-    def __getattr__(self, attr, /):
-        return getattr(self.__dict__, attr)
-
-    def __getattribute__(self, attr, /):
-        if attr is "__dict__":
-            return super().__getattribute__(attr)
-        try:
-            return self[attr]
-        except KeyError:
-            return super().__getattribute__(attr)
-
-    def __getitem__(self, key, /):
-        d = self.__dict__[key]
-        if type(d) is dict:
-            return type(self)(d)
-        return d
-
-
-class ChainDictAttr(DictAttr):
-
-    def __getitem__(self, key, /):
-        try:
-            super().__getitem__(key)
-        except KeyError:
-            d = type(self)()
-            self.__dict__[key] = d.__dict__
-            return d
-