moat-lib-path 0.3.5__tar.gz → 0.3.7__tar.gz

{moat_lib_path-0.3.5/src/moat_lib_path.egg-info → moat_lib_path-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-lib-path
-Version: 0.3.5
+Version: 0.3.7
 Summary: Hierarchical path representation and manipulation for MoaT
 Maintainer-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org

{moat_lib_path-0.3.5 → moat_lib_path-0.3.7}/debian/changelog

@@ -1,3 +1,15 @@
+moat-lib-path (0.3.7-1) unstable; urgency=medium
+
+  * New release for 26.4.27
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Sat, 03 Oct 2026 14:53:15 +0200
+
+moat-lib-path (0.3.6-1) unstable; urgency=medium
+
+  * New release for 26.4.26
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Sat, 03 Oct 2026 12:53:26 +0200
+
 moat-lib-path (0.3.5-1) unstable; urgency=medium
 
   * New release for 26.4.0

{moat_lib_path-0.3.5 → moat_lib_path-0.3.7}/pyproject.toml

@@ -22,7 +22,7 @@ name = "moat-lib-path"
 maintainers = [{email = "matthias@urlichs.de",name = "Matthias Urlichs"}]
 description='Hierarchical path representation and manipulation for MoaT'
 readme = "README.md"
-version = "0.3.5"
+version = "0.3.7"
 
 [project.urls]
 homepage = "https://m-o-a-t.org"

{moat_lib_path-0.3.5 → moat_lib_path-0.3.7}/src/moat/lib/path/_impl.py

@@ -53,11 +53,11 @@ from collections.abc import Sequence
 from typing import TYPE_CHECKING, Literal, TypeAlias, cast, overload
 
 if TYPE_CHECKING:
-    from typing import Any, Literal
+    from typing import Any
 
 PathTuple: TypeAlias = tuple["PathElem", ...]
-PathElem: TypeAlias = None | bool | int | float | str | bytes | PathTuple
-PathElemI: TypeAlias = None | bool | int | float | str | bytes | tuple
+PathElem: TypeAlias = bool | int | float | str | bytes | PathTuple | None
+PathElemI: TypeAlias = bool | int | float | str | bytes | tuple | None
 
 __all__ = [
     "PS",
@@ -78,7 +78,7 @@ _PartRE = re.compile("[^:._]+|_|:|\\.")
 _RTagRE = re.compile("^:m[^:._]+:$")
 
 
-def set_root(cfg):
+def set_root(cfg) -> None:
     """
     Utility to force-set the root global.
 
@@ -176,7 +176,7 @@ class Path(Sequence[PathElem]):
         prefix: RootPath | Literal[True] | None = None,
         decoded: bool = False,
         _warn: bool = True,
-    ):
+    ) -> None:
         """
         Create a path from the given elements.
 
@@ -196,14 +196,20 @@ class Path(Sequence[PathElem]):
         if mark:
             warnings.warn("Marking a path is deprecated")
 
-        if _warn and a:
+        if not a:
+            pass
+        elif decoded and isinstance(a[0], RootPath) and prefix is None:
+            prefix = a[0]
+            a = a[1:]
+        elif isinstance(a[0], Path):
+            if len(a) > 1:
+                raise ValueError("Can't build a path this way")
+            a = a[0].as_tuple()
+        elif len(a) != 1 and _warn:
             warnings.warn(
                 "Call 'Path.build(args)', not 'Path(*args)'", DeprecationWarning, stacklevel=2
             )
 
-        if decoded and a and isinstance(a[0], RootPath) and prefix is None:
-            prefix = a[0]
-            a = a[1:]
         for x in a:
             if not isinstance(x, PathElemI):  # pyright:ignore[reportArgumentType]
                 raise TypeError(f"{x!r} cannot be in a path")
@@ -609,10 +615,10 @@ class Path(Sequence[PathElem]):
 
     # TODO add alternate output with hex integers
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"P({str(self)!r})"
 
-    def __format__(self, spec):
+    def __format__(self, spec) -> str:
         return str(self).__format__(spec)
 
     @classmethod
@@ -650,7 +656,7 @@ class Path(Sequence[PathElem]):
                 raise SyntaxError(f"Conflicting tags: {mark} vs. {mp[0][2:-1]}")
             return cls(mark=mark)
 
-        def add(x):
+        def add(x) -> None:
             nonlocal part
             if not isinstance(part, str):
                 part = ""
@@ -659,7 +665,7 @@ class Path(Sequence[PathElem]):
             except TypeError:
                 raise SyntaxError(f"Cannot add {x!r} at {pos}") from None
 
-        def done(new_part):
+        def done(new_part) -> None:
             nonlocal part
             nonlocal eval_
             if isinstance(part, str):
@@ -681,7 +687,7 @@ class Path(Sequence[PathElem]):
                 res.append(part)
             part = new_part
 
-        def new(x):
+        def new(x) -> None:
             nonlocal part
             if part is None:
                 raise SyntaxError(f"Cannot use {part!r} at {pos}")
@@ -1066,7 +1072,7 @@ class PathShortener:
     Caution: this shortener ignores path marks.
     """
 
-    def __init__(self, prefix: Path | list | tuple = Path()):
+    def __init__(self, prefix: Path | list | tuple = Path()) -> None:
         self.prefix = prefix if isinstance(prefix, Path) else Path.build(prefix)
         self.depth = len(prefix)
         self.path = []
@@ -1113,7 +1119,7 @@ class PathLongener:
 
     cls: type[Path] = Path
 
-    def __init__(self, prefix: Path | PathTuple = ()):
+    def __init__(self, prefix: Path | PathTuple = ()) -> None:
         if isinstance(prefix, Path):
             self.cls = type(prefix)
             prefix = prefix.raw
@@ -1181,7 +1187,7 @@ class Var:
     This mimics a ContextVar but without the context.
     """
 
-    def __init__(self, name, default=NotGiven):
+    def __init__(self, name, default=NotGiven) -> None:
         self.name = name
         self.default = default
         self.data = NotGiven
@@ -1221,11 +1227,11 @@ class Var:
         self.data = val
         return _VAR_SET_TOKEN
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         "check if value is set"
         return self.data is not NotGiven
 
-    def reset(self, token):
+    def reset(self, token) -> None:
         "reset value; no-op"
         if token is not _VAR_SET_TOKEN:
             raise ValueError(token)
@@ -1244,11 +1250,11 @@ class RootPath(Path):
 
     _mark = ""
 
-    def __init__(self, key: str, var: ContextVar[Path | None] | Var):
+    def __init__(self, key: str, var: ContextVar[Path | None] | Var) -> None:
         self._key = key
         self._var = var
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"{self._key}={super().__repr__()}"
 
     @property

{moat_lib_path-0.3.5 → moat_lib_path-0.3.7/src/moat_lib_path.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-lib-path
-Version: 0.3.5
+Version: 0.3.7
 Summary: Hierarchical path representation and manipulation for MoaT
 Maintainer-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org