rel branch merged patch branch pb_polish_dotdict

Author: liu-yucheng

README.md

@@ -36,28 +36,37 @@ Python interactive shell demo use case:
 >>> DotDict = dotdict.DotDict
 >>>
 >>> sample = DotDict()
+>>> sample
+DotDict(**{})
 >>> print(sample)
 .{}
 >>>
 >>> sample.attr1 = 1
 >>> sample.attr2 = 1.1
 >>> sample.attr3 = True
 >>> sample.attr4 = "Hello"
->>> print(sample)
-.{attr1: 1, attr2: 1.1, attr3: True, attr4: Hello}
->>> print(sample.attr4)
-Hello
->>>
 >>> sample.attr5 = {"hello": "World"}
+>>> sample
+DotDict(**{'attr1': 1, 'attr2': 1.1, 'attr3': True, 'attr4': 'Hello', 'attr5': DotDict(**{'hello': 'World'})})
 >>> print(sample)
-.{attr1: 1, attr2: 1.1, attr3: True, attr4: Hello, attr5: .{hello: World}}
+.{attr1: 1, attr2: 1.1, attr3: True, attr4: 'Hello', attr5: .{hello: 'World'}}
 >>> print(sample.attr5.hello)
 World
 >>>
 >>> sample2 = sample.to_dict____()
 >>> print(sample2)
 {'attr1': 1, 'attr2': 1.1, 'attr3': True, 'attr4': 'Hello', 'attr5': {'hello': 'World'}}
 >>>
+>>> sample3 = eval(repr(sample))
+>>> sample3
+DotDict(**{'attr1': 1, 'attr2': 1.1, 'attr3': True, 'attr4': 'Hello', 'attr5': DotDict(**{'hello': 'World'})})
+>>> print(sample3)
+.{attr1: 1, attr2: 1.1, attr3: True, attr4: 'Hello', attr5: .{hello: 'World'}}
+>>> print(sample3 == sample)
+True
+>>> len(sample3)
+5
+>>>
 ```
 
 ## `TimedInput`

lyc_pyutils/__init__.py

@@ -15,25 +15,33 @@
 from lyc_pyutils.libs import timedinput
 from lyc_pyutils.libs import clamps
 
+dotdict = dotdict
 DotDict = dotdict.DotDict
 
+timedinput = timedinput
 TimedInput = timedinput.TimedInput
 
+functhread = functhread
 FuncThread = functhread.FuncThread
 
+randbool = randbool
 rand_bool = randbool.rand_bool
 
+jsonrw = jsonrw
 load_json = jsonrw.load_json
 save_json = jsonrw.save_json
 load_json_str = jsonrw.load_json_str
 save_json_str = jsonrw.save_json_str
 
+batchlog = batchlog
 logstr = batchlog.logstr
 logln = batchlog.logln
 flushlogs = batchlog.flushlogs
 
+textrw = textrw
 load_text = textrw.load_text
 save_text = textrw.save_text
 
+clamps = clamps
 clamp_float = clamps.clamp_float
 clamp_int = clamps.clamp_int

lyc_pyutils/libs/dotdict.py

@@ -64,7 +64,7 @@ def from_dict____(cls, dict_):
         Returns:
             result: the resulting DotDict
         """
-        # print(f"fromdict____ dic: {dic}")  # Debug
+        # print(f"from_dict____ dict_: {dict_}")  # Debug
         result = DotDict()
 
         for key in dict_:
@@ -115,33 +115,33 @@ def _mand_init(self, *args, **kwargs):
 
         # Set the inherited keys from the custom class level
         if self_type is not DotDict and issubclass(self_type, DotDict):
-            class_dict = self_type.__dict__
+            class_dir = dir(self_type)
 
-            for key in class_dict:
-                key = str(key)
-                # print(f"_dot_dict_init class_dict {key}: {class_dict[key]}")  # Debug
+            for name in class_dir:
+                name = str(name)
+                # print(f"_mand_init class attribute {name}: {getattr(self_type, name)}")  # Debug
 
-                if not self_type.is_exc_key____(key):
-                    val = class_dict[key]
-                    self.set_attr____(key, val)
+                if not self_type.is_exc_key____(name):
+                    val = getattr(self_type, name)
+                    self.set_attr____(name, val)
             # end for
         # end if
 
         # Set keys with the key names from the variable arguments
         for arg in args:
             arg = str(arg)
-            # print(f"_dot_dict_init *args arg: {arg}")  # Debug
+            # print(f"_mand_init *args arg: {arg}")  # Debug
 
-            if not self_type.is_exc_key____(key):
+            if not self_type.is_exc_key____(name):
                 self.set_attr____(arg, None)
         # end for
 
         # Set pairs with the key names and values from the keyword arguments
         for kw in kwargs:
             kw = str(kw)
-            # print(f"_dot_dict_init **kwargs kw: {kw}  arg: {kwargs[kw]}")  # Debug
+            # print(f"_mand_init **kwargs kw: {kw}  arg: {kwargs[kw]}")  # Debug
 
-            if not self_type.is_exc_key____(key):
+            if not self_type.is_exc_key____(name):
                 arg = kwargs[kw]
                 self.set_attr____(kw, arg)
         # end for
@@ -753,14 +753,24 @@ def str____(self):
             result = ".{}"
             return result
 
-        result = ".{"
+        segs = []
 
         for key in self:
-            result += f"{key.__str__()}: {self[key].__str__()}, "
+            val = self[key]
+
+            if isinstance(val, DotDict):
+                seg = f"{key.__str__()}: {val.__str__()}, "
+            else:
+                seg = f"{key.__str__()}: {val.__repr__()}, "
+            # end if
+
+            segs.append(seg)
+        # end for
 
-        result = result[:-2]  # Remove the trailing comma and space
-        result += "}"
+        contents = "".join(segs)
+        contents = contents[:-2]  # Remove the trailing comma and space
 
+        result = f".{{{contents}}}"
         return result
 
     def to_dict____(self):

setup.py

@@ -22,7 +22,7 @@
 def main():
     _setup(
         name="lyc-pyutils",
-        version="2.0.1",
+        version="2.0.2",
         author="Yucheng Liu",
         license="Copyright (C) 2022 Yucheng Liu. GNU LGPL3 license.",
         description="LYC's personal Python utilities.",