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

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev201'
-__revision__ = '77be9dbd97d16b54293dbf9f3803e3fa882ecc5f'
+__version__ = '0.0.0.dev203'
+__revision__ = '8499b6c7847c312b26968efc48f599be879b4f3a'
 
 
 #

omlish/formats/props.py

@@ -306,8 +306,7 @@ class Properties(collections.abc.MutableMapping):
             if self._metadoc and self._prev_key:
                 prev_metadata = self._metadata.setdefault(self._prev_key, {})
                 prev_metadata.setdefault('_doc', '')
-                if docstr.startswith(' '):
-                    docstr = docstr[1:]
+                docstr = docstr.removeprefix(' ')
                 prev_metadata['_doc'] += docstr + '\n'
             return
 

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/lang/__init__.py

@@ -189,7 +189,8 @@ from .resolving import (  # noqa
 )
 
 from .resources import (  # noqa
-    RelativeResource,
+    ReadableResource,
+    get_package_resources,
     get_relative_resources,
 )
 

omlish/lang/resources.py

@@ -6,7 +6,7 @@ import typing as ta
 
 
 @dc.dataclass(frozen=True)
-class RelativeResource:
+class ReadableResource:
     name: str
     is_file: bool
     read_bytes: ta.Callable[[], bytes]
@@ -15,13 +15,26 @@ class RelativeResource:
         return self.read_bytes().decode(encoding)
 
 
+def get_package_resources(anchor: str) -> ta.Mapping[str, ReadableResource]:
+    lst: list[ReadableResource] = []
+
+    for pf in importlib.resources.files(anchor).iterdir():
+        lst.append(ReadableResource(
+            name=pf.name,
+            is_file=pf.is_file(),
+            read_bytes=pf.read_bytes if pf.is_file() else None,  # type: ignore
+        ))
+
+    return {r.name: r for r in lst}
+
+
 def get_relative_resources(
         path: str = '',
         *,
         globals: ta.Mapping[str, ta.Any] | None = None,  # noqa
         package: str | None = None,
         file: str | None = None,
-) -> ta.Mapping[str, RelativeResource]:
+) -> ta.Mapping[str, ReadableResource]:
     if globals is not None:
         if not package:
             package = globals.get('__package__')
@@ -45,7 +58,7 @@ def get_relative_resources(
 
     #
 
-    lst: list[RelativeResource] = []
+    lst: list[ReadableResource] = []
 
     if package:
         pkg_parts = package.split('.')
@@ -53,7 +66,7 @@ def get_relative_resources(
             pkg_parts = pkg_parts[:-num_up]
         anchor = '.'.join([*pkg_parts, *path_parts])
         for pf in importlib.resources.files(anchor).iterdir():
-            lst.append(RelativeResource(
+            lst.append(ReadableResource(
                 name=pf.name,
                 is_file=pf.is_file(),
                 read_bytes=pf.read_bytes if pf.is_file() else None,  # type: ignore
@@ -73,7 +86,7 @@ def get_relative_resources(
 
         for ff in os.listdir(dst_dir):
             ff = os.path.join(dst_dir, ff)
-            lst.append(RelativeResource(
+            lst.append(ReadableResource(
                 name=os.path.basename(ff),
                 is_file=os.path.isfile(ff),
                 read_bytes=functools.partial(_read_file, ff),

omlish/sql/abc.py

@@ -1,3 +1,6 @@
+"""
+https://peps.python.org/pep-0249/
+"""
 import typing as ta
 
 
@@ -14,6 +17,16 @@ DbapiColumnDescription: ta.TypeAlias = tuple[
 ]
 
 
+class DbapiColumnDescription_(ta.NamedTuple):  # noqa
+    name: str
+    type_code: DbapiTypeCode
+    display_size: int | None
+    internal_size: int | None
+    precision: int | None
+    scale: int | None
+    null_ok: bool | None
+
+
 class DbapiConnection(ta.Protocol):
     def close(self) -> object: ...
 

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

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

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

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=dyIpveH7Z8OnQp2pTn6NVv7LCDXVrozJWAzbk8PBavg,7950
-omlish/__about__.py,sha256=nozjeM6WZjCDpl0YL18Qfh8ve_0Ihl-hf7OLBlfHY70,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
@@ -226,9 +226,9 @@ omlish/formats/codecs.py,sha256=ip4TLOyWAaUyEJmrIOzuLMtjRdgaMEsC6JeAlcCVi28,1657
 omlish/formats/dotenv.py,sha256=qoDG4Ayu7B-8LjBBhcmNiLZW0_9LgCi3Ri2aPo9DEQ8,19314
 omlish/formats/json5.py,sha256=odpZIShlUpv19aACWe58SoMPcv0AHKIa6zSMjlKgaMI,515
 omlish/formats/pickle.py,sha256=jdp4E9WH9qVPBE3sSqbqDtUo18RbTSIiSpSzJ-IEVZw,529
-omlish/formats/props.py,sha256=cek3JLFLIrpE76gvs8rs_B8yF4SpY8ooDH8apWsquwE,18953
+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
@@ -357,7 +357,7 @@ omlish/iterators/iterators.py,sha256=ghI4dO6WPyyFOLTIIMaHQ_IOy2xXaFpGPqveZ5YGIBU
 omlish/iterators/recipes.py,sha256=53mkexitMhkwXQZbL6DrhpT0WePQ_56uXd5Jaw3DfzI,467
 omlish/iterators/tools.py,sha256=SvXyyQJh7aceLYhRl6pQB-rfSaXw5IMIWukeEeOZt-0,2492
 omlish/iterators/unique.py,sha256=0jAX3kwzVfRNhe0Tmh7kVP_Q2WBIn8POo_O-rgFV0rQ,1390
-omlish/lang/__init__.py,sha256=GqZ3exAAK7iphRf8e4d3CvAz7EptvmEOmCkmN06uYvQ,3986
+omlish/lang/__init__.py,sha256=091aYd1gRii-ulxI9QAMjZBPLcl-kfL-XU82kLMR0qU,4013
 omlish/lang/cached.py,sha256=92TvRZQ6sWlm7dNn4hgl7aWKbX0J1XUEo3DRjBpgVQk,7834
 omlish/lang/clsdct.py,sha256=AjtIWLlx2E6D5rC97zQ3Lwq2SOMkbg08pdO_AxpzEHI,1744
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
@@ -372,7 +372,7 @@ omlish/lang/iterables.py,sha256=HOjcxOwyI5bBApDLsxRAGGhTTmw7fdZl2kEckxRVl-0,1994
 omlish/lang/maybes.py,sha256=1RN7chX_x2XvgUwryZRz0W7hAX-be3eEFcFub5vvf6M,3417
 omlish/lang/objects.py,sha256=LOC3JvX1g5hPxJ7Sv2TK9kNkAo9c8J-Jw2NmClR_rkA,4576
 omlish/lang/resolving.py,sha256=OuN2mDTPNyBUbcrswtvFKtj4xgH4H4WglgqSKv3MTy0,1606
-omlish/lang/resources.py,sha256=yywDWhh0tsgw24l7mHYv49ll4oZS8Kc8MSCa8f4UbbI,2280
+omlish/lang/resources.py,sha256=N64KeVE-rYMxqBBRp91qzgVqpOVR2uX7k1WlS_bo5hM,2681
 omlish/lang/strings.py,sha256=BsciSYnckD4vGtC6kmtnugR9IN6CIHdcjO4nZu-pSAw,3898
 omlish/lang/sys.py,sha256=UoZz_PJYVKLQAKqYxxn-LHz1okK_38I__maZgnXMcxU,406
 omlish/lang/timeouts.py,sha256=vECdWYhc_IZgcal1Ng1Y42wf2FV3KAx-i8As-MgGHIQ,1186
@@ -531,7 +531,7 @@ omlish/specs/openapi/__init__.py,sha256=zilQhafjvteRDF_TUIRgF293dBC6g-TJChmUb6T9
 omlish/specs/openapi/marshal.py,sha256=Z-E2Knm04C81N8AA8cibCVSl2ImhSpHZVc7yAhmPx88,2135
 omlish/specs/openapi/openapi.py,sha256=y4h04jeB7ORJSVrcy7apaBdpwLjIyscv1Ub5SderH2c,12682
 omlish/sql/__init__.py,sha256=TpZLsEJKJzvJ0eMzuV8hwOJJbkxBCV1RZPUMLAVB6io,173
-omlish/sql/abc.py,sha256=kiOitW_ZhTXrJanJ582wD7o9K69v6HXqDPkxuHEAxrc,1606
+omlish/sql/abc.py,sha256=NfbcIlEvdEu6vn0TolhfYb2SO5uzUmY0kARCbg6uVAU,1879
 omlish/sql/dbapi.py,sha256=5ghJH-HexsmDlYdWlhf00nCGQX2IC98_gxIxMkucOas,3195
 omlish/sql/dbs.py,sha256=lpdFmm2vTwLoBiVYGj9yPsVcTEYYNCxlYZZpjfChzkY,1870
 omlish/sql/params.py,sha256=Z4VPet6GhNqD1T_MXSWSHkdy3cpUEhST-OplC4B_fYI,4433
@@ -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.dev201.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev201.dist-info/METADATA,sha256=_xm1Dh4zcl8xwhcC7IQ83_lZs18KGg7gufxEsCbfPHA,4264
-omlish-0.0.0.dev201.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omlish-0.0.0.dev201.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev201.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev201.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,,