buildz 0.6.3__tar.gz → 0.6.5__tar.gz

{buildz-0.6.3/buildz.egg-info → buildz-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.3
+Version: 0.6.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.6.3 → buildz-0.6.5}/buildz/fz/__init__.py

@@ -2,7 +2,7 @@
 #author:
 from .dirz import dirs, FileDeal
 from .lsf import lists, search, searchd,searchs,_search
-from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir,removes, cover, fcover
+from .fio import fread, freads, fwrite, fwrites, read,reads,write,writes, makefdir, dirpath,makedir,removes, cover, fcover, sread, swrite
 from .fhs import fhash
 
 __author__ = "Zzz, emails: 1174534295@qq.com, 1309458652@qq.com"

{buildz-0.6.3 → buildz-0.6.5}/buildz/fz/fio.py

@@ -92,4 +92,19 @@ def decode(s, coding = 'utf-8'):
     except:
         return s.decode(xcoding)
 
+pass
+
+def sread(fp, code='utf-8', mode='r'):
+    if mode.find("b")<0:
+        mode+="b"
+    return decode(read(fp, mode), code)
+
+pass
+def swrite(dt, fp, code="utf-8", mode = "w"):
+    if mode.find("b")<0:
+        mode+="b"
+    if type(dt)!=bytes:
+        dt = dt.encode(code)
+    write(dt, fp, mode)
+
 pass

{buildz-0.6.3 → buildz-0.6.5}/buildz/fz/lsf.py

@@ -129,21 +129,25 @@ class SearchDeal(dirz.FileDeal):
                 else:
                     try:
                         s = s.decode(code)
-                        pt = self.pts[mark].decode(code)
+                        pt = self.pts[mark]#.decode(code)
+                        if type(pt)==bytes:
+                            pt = pt.decode(code)
                         finds = re.findall(pt, s)
                     except Exception as exp:
-                        print(f"error in decode {filepath}, {pts[mark]} with '{code}': {exp}")
+                        print(f"error in decode {filepath}, {self.pts[mark]} with '{code}': {exp}")
                 for bs_find in finds:
                     if type(bs_find)==[list, tuple]:
                         bs_find = bs_find[0]
                     if type(self.pt)==str:
-                        bs_find = bs_find.encode(code)
+                        if type(bs_find)==bytes:
+                            bs_find = bs_find.decode(code)
                     #bs_find = b">>>>>>>\n"+bs_find+b"\n<<<<<<\n"
                     #bs_find += b"\n"+bld+b"\n"
                     arr.append(bs_find)
                     arr.append(bldi)
                 arr.append(blda)
                 arr.append(b"")
+                arr =[k if type(k)==bytes else k.encode(code) for k in arr]
                 arr = b"\n".join(arr)
                 try:
                     arr = decode(arr)

{buildz-0.6.3 → buildz-0.6.5}/buildz/ioc/init.py

@@ -6,7 +6,10 @@ from .ioc_deal.base import default_deals
 def build(fp_init = None, add_default_deals = True):
     obj = confs.Confs()
     if (fp_init is not None):
-        obj.init_fp(fp_init)
+        if type(fp_init)==dict:
+            obj.init(fp_init)
+        else:
+            obj.init_fp(fp_init)
     if add_default_deals:
         obj.add_fp(default_deals)
     return obj

{buildz-0.6.3 → buildz-0.6.5}/buildz/ioc/ioc/confs.py

@@ -309,10 +309,11 @@ class Confs(Base):
     def add_fp(self, fp):
         try:
             conf = self.loads(xf.fread(fp))
+            return self.add(conf)
         except:
             print(f'error in loads: {fp}')
             raise
-        return self.add(conf)
+        #return self.add(conf)
     def adds(self, confs):
         for conf in confs:
             self.add(conf)
@@ -405,8 +406,6 @@ class Confs(Base):
         for confs,i in arr:
             id = self.id(ids[i:])
             for conf in confs:
-                if sid == conf.id:
-                    continue
                 _conf = conf.get_data(id, sid==conf.id, False, src = src, info = info)
                 if _conf is not None:
                     return _conf

{buildz-0.6.3 → buildz-0.6.5/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.3
+Version: 0.6.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.6.3 → buildz-0.6.5}/setup.py

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