moat-lib-path 0.3.3__tar.gz → 0.3.6__tar.gz

{moat_lib_path-0.3.3/src/moat_lib_path.egg-info → moat_lib_path-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-lib-path
-Version: 0.3.3
+Version: 0.3.6
 Summary: Hierarchical path representation and manipulation for MoaT
 Maintainer-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org
@@ -16,7 +16,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: anyio~=4.0
-Requires-Dist: moat-lib-proxy~=0.1.1
+Requires-Dist: moat-lib-proxy~=0.1.3
 Requires-Dist: regex
 Dynamic: license-file
 

{moat_lib_path-0.3.3 → moat_lib_path-0.3.6}/debian/changelog

@@ -1,3 +1,33 @@
+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
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 29 Sep 2026 16:47:45 +0200
+
+moat-lib-path (0.3.4-1) unstable; urgency=medium
+
+  * New release for 26.2.13
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Wed, 23 Sep 2026 15:11:26 +0200
+
+moat-lib-path (0.3.3-3) unstable; urgency=medium
+
+  * New release for 26.2.3
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Mon, 15 Jun 2026 18:03:16 +0200
+
+moat-lib-path (0.3.3-2) unstable; urgency=medium
+
+  * New release for 26.1.12
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Fri, 24 Apr 2026 15:40:58 +0200
+
 moat-lib-path (0.3.3-1) unstable; urgency=medium
 
   * New release for 26.1.10

{moat_lib_path-0.3.3 → moat_lib_path-0.3.6}/debian/control

@@ -2,12 +2,11 @@ Source: moat-lib-path
 Maintainer: "Matthias Urlichs" <matthias@urlichs.de>
 Section: python
 Priority: optional
-Build-Depends: dh-python, python3-all, debhelper (>= 13),
+Build-Depends: dh-python, python3-all, debhelper (>= 13), debhelper-compat (= 13),
   python3-setuptools,
   python3-wheel,
 Standards-Version: 3.9.6
 Homepage: https://m-o-a-t.org
-X-DH-Compat: 13
 
 Package: python3-moat-lib-path
 Architecture: all

{moat_lib_path-0.3.3 → moat_lib_path-0.3.6}/pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
 ]
 dependencies = [
     "anyio ~= 4.0",
-    "moat-lib-proxy ~= 0.1.1",
+    "moat-lib-proxy ~= 0.1.3",
     "regex",
 ]
 keywords = ["MoaT"]
@@ -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.3"
+version = "0.3.6"
 
 [project.urls]
 homepage = "https://m-o-a-t.org"

{moat_lib_path-0.3.3 → moat_lib_path-0.3.6}/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.
 
@@ -130,6 +130,7 @@ class Path(Sequence[PathElem]):
         :Q   An alias for an alternate root
         :P   An alias for another alternate root
         :S   An alias for yet another alternate root
+        :T   An alias for a root used for testing
         :@   Marks this path as relative
 
     The empty path is denoted by a single colon. A path that starts or ends
@@ -175,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.
 
@@ -343,7 +344,7 @@ class Path(Sequence[PathElem]):
         Slash encoding does not work with empty paths; marks are ignored.
 
         Roots are expanded when slashed. Otherwise they are represented
-        as ``:S``, ``:P``, ``:Q``, or ``:R``.
+        as ``:S``, ``:P``, ``:Q``, ``:R``, or ":T".
         """
 
         def _escol(x, spaces=True):
@@ -608,10 +609,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
@@ -649,7 +650,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 = ""
@@ -658,7 +659,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):
@@ -680,7 +681,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}")
@@ -1065,7 +1066,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 = []
@@ -1112,7 +1113,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
@@ -1157,12 +1158,30 @@ path_eval = _eval.eval
 # Here we declare our bunch of "root" variables.
 
 
+class _NoResetToken:
+    """Token returned by :meth:`Var.set`.
+
+    ``Var`` has no context to restore, so unlike a real ``ContextVar`` token
+    this carries no state: its only job is to be recognisable to
+    :meth:`Var.reset` so the ``set``/``reset`` protocol driven by ``ctx_as``
+    works uniformly for both ``ContextVar`` and ``Var``.
+    """
+
+    __slots__ = ()
+
+    def __repr__(self) -> str:
+        return "<Var no-reset token>"
+
+
+_VAR_SET_TOKEN = _NoResetToken()
+
+
 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
@@ -1178,20 +1197,37 @@ class Var:
         # If the root is a.b.c, a new identical value will arrive as an
         # empty path with a root of a.b.c. That's bad. Thus silently don't
         # update in that case.
+        #
+        # We detect that case structurally.
+        #
+        # Match by the RootPath's *key* ("R"), not by ``_var is self``:
+        # the ``RootPath`` embedded in @val may hold a stale ``Var`` (a
+        # second ``Root`` instance created, if the namespace-packaged
+        # ``moat.lib.path._impl`` is loaded more than once), so identity
+        # would fail even though @val denotes the same root.
+        if (
+            not force
+            and self.data is not NotGiven
+            and isinstance(val, Path)
+            and isinstance(val._prefix, RootPath)  # noqa:SLF001
+            and val._prefix._key == "R"  # noqa:SLF001
+            and not len(val._data)  # noqa:SLF001
+        ):
+            return _VAR_SET_TOKEN
         if not force and self.data is not NotGiven:
             if self.data.slashed != val.slashed:
                 raise ValueError("Already set", self.data, val)
-            return 42
+            return _VAR_SET_TOKEN
         self.data = val
-        return 42
+        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 != 42:
+        if token is not _VAR_SET_TOKEN:
             raise ValueError(token)
 
 
@@ -1208,11 +1244,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
@@ -1245,7 +1281,7 @@ _root = RootPath("R", Root)
 as_proxy("R", _root)
 _Roots = {"R": _root}
 
-for _idx in "SPQ":  # and R. Yes I know.
+for _idx in "SPQT":  # and R. Yes I know.
     _name = f"{_idx}_Root"
     _ctx = ContextVar[Path | None](_name, default=None)
     _path = RootPath(_idx, _ctx)
@@ -1262,5 +1298,6 @@ if TYPE_CHECKING:
     S_Root = ContextVar[Path | None]("S_Root", default=None)
     P_Root = ContextVar[Path | None]("P_Root", default=None)
     Q_Root = ContextVar[Path | None]("Q_Root", default=None)
+    T_Root = ContextVar[Path | None]("T_Root", default=None)
 
-__all__ += ["P_Root", "Q_Root", "S_Root"]
+__all__ += ["P_Root", "Q_Root", "S_Root", "T_Root"]

{moat_lib_path-0.3.3 → moat_lib_path-0.3.6/src/moat_lib_path.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-lib-path
-Version: 0.3.3
+Version: 0.3.6
 Summary: Hierarchical path representation and manipulation for MoaT
 Maintainer-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org
@@ -16,7 +16,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: anyio~=4.0
-Requires-Dist: moat-lib-proxy~=0.1.1
+Requires-Dist: moat-lib-proxy~=0.1.3
 Requires-Dist: regex
 Dynamic: license-file
 

moat_lib_path-0.3.6/src/moat_lib_path.egg-info/requires.txt

@@ -0,0 +1,3 @@
+anyio~=4.0
+moat-lib-proxy~=0.1.3
+regex

moat_lib_path-0.3.3/src/moat_lib_path.egg-info/requires.txt

@@ -1,3 +0,0 @@
-anyio~=4.0
-moat-lib-proxy~=0.1.1
-regex