buildz 0.8.4__tar.gz → 0.8.5__tar.gz

{buildz-0.8.4/buildz.egg-info → buildz-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.4
+Version: 0.8.5
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.8.4 → buildz-0.8.5}/buildz/argx.py

@@ -43,12 +43,15 @@ class Fetch:
             rst[key] = args[i]
         for key in maps:
             rst[key] = maps[key]
-        for key in self.maps:
-            rkey = self.maps[key]
-            if key in rst:
-                val = rst[key]
-                rst[rkey] = val
-                del rst[key]
+        keys = list(rst.keys())
+        for key in keys:
+            while key in self.maps:
+                rkey = self.maps[key]
+                if key in rst:
+                    val = rst[key]
+                    rst[rkey] = val
+                    del rst[key]
+                key = rkey
         return rst
 
 pass

{buildz-0.8.4 → buildz-0.8.5}/buildz/base.py

@@ -96,6 +96,12 @@ class With(Base):
 pass
 
 class Args(Base):
+    @staticmethod
+    def is_args(obj):
+        return isinstance(obj, Args)
+    @staticmethod
+    def is_collect(obj):
+        return Args.is_args(obj) or type(obj) in (list, tuple, dict)
     def __len__(self):
         return self.size()
     def as_dict(self, deep=False):

{buildz-0.8.4 → buildz-0.8.5}/buildz/dz/mapz.py

@@ -1,4 +1,5 @@
 from buildz import pyz
+from ..base import Args
 def isdict(obj):
     return type(obj)==dict
 def islist(obj):
@@ -257,6 +258,38 @@ def l2m(arr, **maps):
     return rst
 
 pass
+def deep_fill_argx(src, target, replace=1):
+    # print(f"src:{src}")
+    # print(f"target:{target}")
+    if not isinstance(src, Args):
+        if type(src) in (list, tuple):
+            src = Args(src)
+        elif type(src)==dict:
+            src = Args([], src)
+        else:
+            return
+    tp = type(target)
+    if not isinstance(target, Args):
+        if tp == list:
+            target = Args(target)
+        elif tp == dict:
+            target = Args([], target)
+        else:
+            return
+    for it in src.lists:
+        target.args.append(it)
+    for k,v in src.dicts.items():
+        if k not in target.dicts:
+            target.dicts[k] = v
+            continue
+        tv = target.dicts[k]
+        if Args.is_collect(tv) and Args.is_collect(v):
+            deep_fill_argx(v, tv, replace)
+        elif replace:
+            #print(f"[TESTZ] replace: {k}:{tv} to {v}")
+            target.dicts[k] = v
+
+
 
 def deep_update(target, src, replace=1):
     """

{buildz-0.8.4 → buildz-0.8.5}/buildz/pathz.py

@@ -32,7 +32,9 @@ class Path(Base):
         return os.path.join(*a)
     @staticmethod
     def rjoin(path, *a):
-        a = [k.strip() for k in a if k.strip()!=""]
+        a = [k.strip() for k in a if k is not None and k.strip()!=""]
+        if len(a)==0:
+            return None
         if path is None:
             return os.path.join(*a)
         return os.path.join(path, *a)
@@ -69,6 +71,7 @@ class Path(Base):
     def __getattr__(self, name):
         return self.fcs[name]
     def call(self, *obj):
+        return self.fcs[None](*obj)
         it = obj[0]
         fc = Path.join
         if type(it) in (list, tuple):

{buildz-0.8.4 → buildz-0.8.5/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.8.4
+Version: 0.8.5
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.8.4 → buildz-0.8.5}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.8.4',
+    version = '0.8.5',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',