omlish 0.0.0.dev201__tar.gz → 0.0.0.dev202__tar.gz

{omlish-0.0.0.dev201/omlish.egg-info → omlish-0.0.0.dev202}/PKG-INFO

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

{omlish-0.0.0.dev201 → omlish-0.0.0.dev202}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev201'
-__revision__ = '77be9dbd97d16b54293dbf9f3803e3fa882ecc5f'
+__version__ = '0.0.0.dev202'
+__revision__ = '3da244e2a7f1e04753682c9f4ddc813289a82a42'
 
 
 #

{omlish-0.0.0.dev201 → omlish-0.0.0.dev202}/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-0.0.0.dev201 → omlish-0.0.0.dev202}/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-0.0.0.dev201 → omlish-0.0.0.dev202}/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-0.0.0.dev201 → omlish-0.0.0.dev202}/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 → omlish-0.0.0.dev202/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev201 → omlish-0.0.0.dev202}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev201'
+version = '0.0.0.dev202'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',