buildz 0.3.2__tar.gz → 0.3.4__tar.gz

{buildz-0.3.2/buildz.egg-info → buildz-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.3.2
+Version: 0.3.4
 Summary: a json-like file format's read and write code by python, and codes to read and product object from configure file in such format
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.3.2 → buildz-0.3.4}/buildz/base.py

@@ -13,7 +13,7 @@ class Map:
         if obj is None:
             obj = {}
         else:
-            obj = dict(obj)
+            obj = builtins.dict(obj)
         obj.update(maps)
         self.__dict__[Map.Key] = obj
     def __call__(self, **maps):

{buildz-0.3.2 → buildz-0.3.4}/buildz/xconfz/fc_item.py

@@ -1,5 +1,6 @@
 #coding=utf-8
 from buildz.xconfz.base import *
+
 from buildz.xconfz.fmt_base import *
 
 """
@@ -37,7 +38,7 @@ pass
 """
 分割符判断
 """
-class ItemsDeal(BaseDeal):
+class ItemDeal(BaseDeal):
     def find(self, buff):
         for spt in self.spts:
             if self.check_curr(buff, spt):
@@ -74,39 +75,6 @@ class ItemsDeal(BaseDeal):
         return False
 
 pass
-class ItemDeal(BaseDeal):
-    def __init__(self, spt):
-        self.spt= spt
-    def init(self, reg):
-        self.k_spt = reg(self.spt, spt = True)
-    def prev(self, buff, queue):
-        find = self.check_curr(buff, self.spt)
-        if find is None:
-            return False
-        lf = len(find)
-        rm = buff.remain().strip()
-        pos = buff.pos_remain()
-        c_pos = buff.pos_curr()
-        _val = None
-        if len(queue)>0:
-            _val = queue[-1].val
-        if len(queue)==0 or len(rm)>0 or Key.is_inst(_val) and _val.p.spt==True:
-            #print("val:[{rm}]".format(rm=rm))
-            queue.append(Item(rm, pos))
-        queue.append(Item(self.k_spt, c_pos, find))
-        buff.deal2curr(lf)
-        return True
-    def deal(self, queue, stack):
-        if len(queue)==0:
-            return False
-        it = queue[0]
-        if self.k_spt(it.val):
-            queue.pop(0)
-            return True
-        return False
-
-pass
-
 
 '''
 数据生成格式化字符串

{buildz-0.3.2 → buildz-0.3.4}/buildz/xconfz/fc_set.py

@@ -8,7 +8,7 @@ class TypeSet:
         return str(self)
 
 pass
-class SetsDeal(BaseDeal):
+class SetDeal(BaseDeal):
     Type = TypeSet()
     def __str__(self):
         return "@@SetDeal"
@@ -39,55 +39,6 @@ class SetsDeal(BaseDeal):
         queue.append(Item(self.k_spt, c_pos, find, SetDeal.Type))
         buff.deal2curr(lf)
         return True
-    def deal(self, queue, stack):
-        if len(stack)<3:
-            return False
-        if self.k_spt(stack[-2].val):
-            if len(queue)>0:
-                val = queue[0]
-                if val.type == SetDeal.Type:
-                    return False
-            val = stack[-1]
-            if Key.is_inst(val.val):
-                return False
-            val = stack.pop(-1)
-            tmp = stack.pop(-1)
-            key = stack.pop(-1)
-            kv = KeyVal(key.val,val.val)
-            item = Item(kv, key.pos)
-            stack.append(item)
-            return True
-        return False
-
-pass
-class SetDeal(BaseDeal):
-    Type = TypeSet()
-    def __str__(self):
-        return "@@SetDeal"
-    def __repr__(self):
-        return str(self)
-    def find(self, buff):
-        for spt in self.spts:
-            if self.check_curr(buff, spt):
-                return spt
-        return None
-    def __init__(self, spt):
-        self.spt = spt
-    def init(self, reg):
-        self.k_spt = reg(k, spt = True)
-    def prev(self, buff, queue):
-        find = self.find(buff)
-        if find is None:
-            return False
-        lf = len(find)
-        rm = buff.remain().strip()
-        pos = buff.pos_remain()
-        c_pos = buff.pos_curr()
-        if len(queue)==0 or len(rm)>0:
-            queue.append(Item(rm, pos))
-        queue.append(Item(self.k_spt, c_pos, find, SetDeal.Type))
-        buff.deal2curr(lf)
-        return True
     def deal(self, queue, stack):
         if len(stack)<3:
             return False

{buildz-0.3.2 → buildz-0.3.4}/buildz/xconfz/mg_fmt.py

@@ -80,7 +80,7 @@ class JsonFormat(BaseFormat):
         value = node.value
         if value is None:
             return None
-        return json.dumps(node.value)
+        return json.dumps(node.value, ensure_ascii=False)
 
 pass
 def build_format(bts = False, size = 4, format = False, simple = 1, simple_size = 1, loads = None, as_json =False, t_single = True):

{buildz-0.3.2 → buildz-0.3.4}/buildz/xf/loader/deal/spt.py

@@ -18,16 +18,19 @@ class PrevSptDeal(base.BaseDeal):
         buffer.clean()
         crr = pos.get()
         pos.update(data)
+        item_spt = item.PrevItem(self.spt, pos.get(), self.id(), src='spt', allow_empty = self.allow_empty)
         pos.update(c)
         data = data.strip()
         if len(data)==0 and not self.allow_empty:
+            queue.append(item_spt)
             return True
         if len(data)==0:
-            if len(queue)>0 and queue[-1].check(is_val = 1):
+            if len(queue)>0 and queue[-1].any(is_val = 1, right=1):
+                queue.append(item_spt)
                 return True
         obj = item.PrevItem(data, crr, is_val = 1, src='spt')
         queue.append(obj)
-        queue.append(item.PrevItem(self.spt, pos.get(), self.id(), src='spt', allow_empty = self.allow_empty))
+        queue.append(item_spt)
         return True
     def deal(self, queue, stack):
         bl = False

{buildz-0.3.2 → buildz-0.3.4/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.3.2
+Version: 0.3.4
 Summary: a json-like file format's read and write code by python, and codes to read and product object from configure file in such format
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.3.2 → buildz-0.3.4}/setup.py

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