omlish 0.0.0.dev202__py3-none-any.whl → 0.0.0.dev203__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev202'
-__revision__ = '3da244e2a7f1e04753682c9f4ddc813289a82a42'
+__version__ = '0.0.0.dev203'
+__revision__ = '8499b6c7847c312b26968efc48f599be879b4f3a'
 
 
 #

omlish/formats/xml.py

@@ -18,6 +18,49 @@ else:
 ##
 
 
+def strip_ns(tag: str) -> str:
+    # It really do just be like this:
+    # https://github.com/python/cpython/blob/ff3bc82f7c9882c27aad597aac79355da7257186/Lib/xml/etree/ElementTree.py#L803-L804
+    if tag[:1] == '{':
+        _, tag = tag[1:].rsplit('}', 1)
+    return tag
+
+
+##
+
+
+ITER_PARSE_EVENTS = ('start', 'end', 'comment', 'pi', 'start-ns', 'end-ns')
+
+
+def yield_root_children(
+        source: ta.Any,
+        *,
+        retain_on_root: bool = False,
+        **kwargs: ta.Any,
+) -> ta.Iterator['ET.Element']:
+    it = iter(ET.iterparse(source, ('start', 'end'), **kwargs))
+
+    ev, root = next(it)
+    if ev != 'start':
+        raise RuntimeError(ev)
+    yield root
+
+    depth = 0
+    for ev, el in it:
+        if ev == 'start':
+            depth += 1
+
+        elif ev == 'end':
+            depth -= 1
+            if not depth:
+                if not retain_on_root:
+                    root.remove(el)
+                yield el
+
+
+##
+
+
 @dc.dataclass(frozen=True)
 class SimpleElement:
     tag: str
@@ -36,27 +79,38 @@ class SimpleElement:
         return dct
 
 
-def build_simple_element(element: 'ET.Element') -> SimpleElement:
-    atts = {}
-    for name, value in element.attrib.items():
-        atts[name] = value  # noqa
+def build_simple_element(
+        element: 'ET.Element',
+        *,
+        strip_tag_ns: bool = False,
+) -> SimpleElement:
+    def rec(cur: 'ET.Element') -> SimpleElement:
+        atts = {}
+        for name, value in cur.attrib.items():
+            atts[name] = value  # noqa
 
-    body: list[SimpleElement | str] = []
+        body: list[SimpleElement | str] = []
 
-    if element.text and (s := element.text.strip()):
-        body.append(s)
+        if cur.text and (s := cur.text.strip()):
+            body.append(s)
 
-    for child in element:
-        body.append(build_simple_element(child))
+        for child in cur:
+            body.append(rec(child))
 
-        if child.tail and (s := child.tail.strip()):
-            body.append(s)
+            if child.tail and (s := child.tail.strip()):
+                body.append(s)
+
+        tag = cur.tag
+        if strip_tag_ns:
+            tag = strip_ns(tag)
+
+        return SimpleElement(
+            tag,
+            atts,
+            body,
+        )
 
-    return SimpleElement(
-        element.tag,
-        atts,
-        body,
-    )
+    return rec(element)
 
 
 def parse_tree(s: str) -> 'ET.ElementTree':

{omlish-0.0.0.dev202.dist-info → omlish-0.0.0.dev203.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev202
+Version: 0.0.0.dev203
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev202.dist-info → omlish-0.0.0.dev203.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=dyIpveH7Z8OnQp2pTn6NVv7LCDXVrozJWAzbk8PBavg,7950
-omlish/__about__.py,sha256=TkrqZrE-0H4UPhtpzOoT1oElyBJWd2jFOEJucdouLTY,3409
+omlish/__about__.py,sha256=5uwjOU7ezPs6bQf_eJwOpEl8jPeW9UzKUtjquPH_WN4,3409
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -228,7 +228,7 @@ omlish/formats/json5.py,sha256=odpZIShlUpv19aACWe58SoMPcv0AHKIa6zSMjlKgaMI,515
 omlish/formats/pickle.py,sha256=jdp4E9WH9qVPBE3sSqbqDtUo18RbTSIiSpSzJ-IEVZw,529
 omlish/formats/props.py,sha256=auCv-Jx79KGlWfyG1-Qo0ou-Ex0W_mF3r_lDFdsVkWI,18920
 omlish/formats/repr.py,sha256=kYrNs4o-ji8nOdp6u_L3aMgBMWN1ZAZJSAWgQQfStSQ,414
-omlish/formats/xml.py,sha256=ggiOwSERt4d9XmZwLZiDIh5qnFJS4jdmow9m9_9USps,1491
+omlish/formats/xml.py,sha256=rKXN1RDJV-jliM4fZ2NtmsujB5cAGQBMzRHRHEnH9Ko,2661
 omlish/formats/yaml.py,sha256=ffOwGnLA6chdiFyaS7X0TBMGmHG9AoGudzKVWfQ1UOs,7389
 omlish/formats/ini/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/ini/codec.py,sha256=omuFg0kiDksv8rRlWd_v32ebzEcKlgmiPgGID3bRi2M,631
@@ -609,9 +609,9 @@ omlish/text/indent.py,sha256=YjtJEBYWuk8--b9JU_T6q4yxV85_TR7VEVr5ViRCFwk,1336
 omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev202.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev202.dist-info/METADATA,sha256=XEiYKss22Lx_Cerj_g1QURXuSPir4iCoi-tiPex6nik,4264
-omlish-0.0.0.dev202.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omlish-0.0.0.dev202.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev202.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev202.dist-info/RECORD,,
+omlish-0.0.0.dev203.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev203.dist-info/METADATA,sha256=21p9UObqpEGCyCoTCTdNVLdZk3MYwxkiG8uZAVs4U5Y,4264
+omlish-0.0.0.dev203.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omlish-0.0.0.dev203.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev203.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev203.dist-info/RECORD,,