buildz 0.6.23__tar.gz → 0.6.24__tar.gz

{buildz-0.6.23/buildz.egg-info → buildz-0.6.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.23
+Version: 0.6.24
 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.6.23 → buildz-0.6.24}/buildz/auto/cache.py

@@ -33,8 +33,9 @@ class Update(Base):
             return s
         rst = re.findall(self.pt, s)
         for match, key in rst:
+            has = self.cache.has(key)
             val = self.cache.get(key)
-            if val is None:
+            if not has:
                 err = f"'{key}' not found in cache"
                 self.log.error(err)
                 raise Exception(err)
@@ -76,6 +77,9 @@ pass
 @wrap.obj(id="cache.file")
 @wrap.obj_args("mcall, log, tag, [Cache.File]", "env, cache.rfp.current.first, false")
 class Cache(Base):
+    def has(self, key):
+        ks = key.split(".")
+        return xf.has(self.data, ks)
     def get(self, key):
         ks = key.split(".")
         return xf.gets(self.data, ks)
@@ -174,6 +178,8 @@ class Caches(Base):
         self.set_current = cache.set_current
         self.set_basedir = cache.set_basedir
         self.get_basedir = cache.get_basedir
+        self.has_file = cache.has
+        self.has_mem = mem.has
     def get_file(self, key):
         return self.cache.get(key)
     def get_mem(self, key):
@@ -192,5 +198,10 @@ class Caches(Base):
             if v is not None:
                 return v
         return None
+    def has(self, key):
+        for cache in self.caches:
+            if cache.has(key):
+                return True
+        return False
 
 pass

{buildz-0.6.23 → buildz-0.6.24}/buildz/xf/mapz.py

@@ -135,6 +135,22 @@ def sets(maps, keys, val):
     maps[keys[-1]] = val
 
 pass
+def has(maps, keys):
+    if type(keys) != list:
+        keys = [keys]
+    for key in keys:
+        if type(maps)==dict:
+            if key not in maps:
+                return False
+        else:
+            key = int(key)
+            if key>=len(maps):
+                return default
+        maps = maps[key]
+    return True
+
+pass
+
 def gets(maps, keys, default = None):
     if type(keys) != list:
         keys = [keys]

{buildz-0.6.23 → buildz-0.6.24/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.23
+Version: 0.6.24
 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.6.23 → buildz-0.6.24}/setup.py

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