2025-01-09T22:45:04Z

wrmsr · Jan 9, 2025 · 04aa500 · 04aa500
1 parent 8499b6c
commit 04aa500
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 27 deletions.
diff --git a/.pkg/omdev-cext/pyproject.toml b/.pkg/omdev-cext/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.dev203'
+version = '0.0.0.dev204'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omdev == 0.0.0.dev203',
+    'omdev == 0.0.0.dev204',
 ]
 
 [tool.setuptools]

diff --git a/.pkg/omdev-cli/pyproject.toml b/.pkg/omdev-cli/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.dev203'
+version = '0.0.0.dev204'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omdev == 0.0.0.dev203',
+    'omdev == 0.0.0.dev204',
 ]
 
 [project.scripts]

diff --git a/.pkg/omdev/pyproject.toml b/.pkg/omdev/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.dev203'
+version = '0.0.0.dev204'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev203',
+    'omlish == 0.0.0.dev204',
 ]
 
 [project.optional-dependencies]

diff --git a/.pkg/ominfra/pyproject.toml b/.pkg/ominfra/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.dev203'
+version = '0.0.0.dev204'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,9 +22,9 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev203',
-    'omlish == 0.0.0.dev203',
-    'omserv == 0.0.0.dev203',
+    'omdev == 0.0.0.dev204',
+    'omlish == 0.0.0.dev204',
+    'omserv == 0.0.0.dev204',
 ]
 
 [project.optional-dependencies]

diff --git a/.pkg/omlish/pyproject.toml b/.pkg/omlish/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.dev203'
+version = '0.0.0.dev204'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

diff --git a/.pkg/ommlx/pyproject.toml b/.pkg/ommlx/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.dev203'
+version = '0.0.0.dev204'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ommlx'
 dependencies = [
-    'omdev == 0.0.0.dev203',
-    'omlish == 0.0.0.dev203',
+    'omdev == 0.0.0.dev204',
+    'omlish == 0.0.0.dev204',
 ]
 
 [project.optional-dependencies]

diff --git a/.pkg/omserv/pyproject.toml b/.pkg/omserv/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.dev203'
+version = '0.0.0.dev204'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omserv'
 dependencies = [
-    'omlish == 0.0.0.dev203',
+    'omlish == 0.0.0.dev204',
 ]
 
 [project.optional-dependencies]

diff --git a/omlish/__about__.py b/omlish/__about__.py
@@ -1,4 +1,4 @@
-__version__ = '0.0.0.dev203'
+__version__ = '0.0.0.dev204'
 __revision__ = None
 
 

diff --git a/ommlx/wiki/utils/xml.py b/ommlx/wiki/utils/xml.py
@@ -12,7 +12,6 @@
 import typing as ta
 import xml.etree.ElementTree as ET
 
-from omlish import check
 from omlish import lang
 from omlish.formats.xml import strip_ns
 
@@ -71,7 +70,7 @@ def yield_root_children(
 @dc.dataclass(frozen=True, kw_only=True)
 class ElementToKwargs:
     attrs: ta.Mapping[str, tuple[str, ta.Callable[[str], ta.Any]] | str | None] = dc.field(default_factory=dict)
-    scalars: ta.Mapping[str, tuple[str, ta.Callable[[str], ta.Any]] | str | None] = dc.field(default_factory=dict)
+    scalars: ta.Mapping[str, tuple[str, ta.Callable[[str | None], ta.Any]] | str | None] = dc.field(default_factory=dict)  # noqa
     single_children: ta.Mapping[str, tuple[str, ta.Callable[[Element], ta.Any]]] = dc.field(default_factory=dict)
     list_children: ta.Mapping[str, tuple[str, ta.Callable[[Element], ta.Any]]] = dc.field(default_factory=dict)
     text: str | None = None
@@ -109,8 +108,8 @@ def set_kw(k: str, v: ta.Any) -> None:
                     if isinstance(t, str):
                         set_kw(t, cel.text)
                     else:
-                        sk, fn = t
-                        set_kw(sk, fn(check.not_none(cel.text)))
+                        sk, sfn = t
+                        set_kw(sk, sfn(cel.text))
 
             elif k in self.single_children:
                 ck, fn = self.single_children[k]

diff --git a/ommlx/wiki/xml.py b/ommlx/wiki/xml.py
@@ -1,5 +1,7 @@
 import typing as ta
 
+from omlish import check
+
 from . import models as mdl
 from .utils import xml as xu
 
@@ -14,6 +16,10 @@ def symm_dct(*ks: T) -> ta.Mapping[T, T]:
     return {k: k for k in ks}
 
 
+def parse_int(s: str | None) -> int:
+    return int(check.non_empty_str(s))
+
+
 ##
 
 
@@ -83,7 +89,7 @@ def _parse_deleted(s: str) -> bool:
                 'username',
                 'ip',
             ),
-            'id': ('id', int),
+            'id': ('id', parse_int),
         },
     ),
 )
@@ -106,9 +112,9 @@ def _parse_deleted(s: str) -> bool:
     mdl.Revision,
     xu.ElementToKwargs(
         scalars={
-            'id': ('id', int),
-            'parentid': ('parentid', int),
-            'origin': ('origin', int),
+            'id': ('id', parse_int),
+            'parentid': ('parentid', parse_int),
+            'origin': ('origin', parse_int),
             'minor': ('minor', lambda _: True),
             **symm_dct(
                 'timestamp',
@@ -132,8 +138,8 @@ def _parse_deleted(s: str) -> bool:
     mdl.Page,
     xu.ElementToKwargs(
         scalars={
-            'ns': ('ns', int),
-            'id': ('id', int),
+            'ns': ('ns', parse_int),
+            'id': ('id', parse_int),
             **symm_dct(
                 'title',
                 'restrictions',