moat-lib-codec 0.4.11__tar.gz → 0.4.14__tar.gz

{moat_lib_codec-0.4.11/src/moat_lib_codec.egg-info → moat_lib_codec-0.4.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-lib-codec
-Version: 0.4.11
+Version: 0.4.14
 Summary: A simple command/stream multiplexer
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Maintainer-email: Matthias Urlichs <matthias@urlichs.de>
@@ -17,8 +17,8 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: anyio~=4.2
-Requires-Dist: moat-lib-rpc~=0.6.0
+Requires-Dist: moat-lib-rpc~=0.6.1
 Requires-Dist: moat-lib-micro~=0.2.2
 Requires-Dist: moat-lib-proxy~=0.1.1
-Requires-Dist: moat-util~=0.62.3
+Requires-Dist: moat-util~=0.62.6
 Dynamic: license-file

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/debian/changelog

@@ -1,3 +1,15 @@
+moat-lib-codec (0.4.14-1) unstable; urgency=medium
+
+  * New release for 26.0.1
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Wed, 18 Feb 2026 18:28:41 +0100
+
+moat-lib-codec (0.4.14-1) unstable; urgency=medium
+
+  * New release for 26.0.1
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Wed, 18 Feb 2026 18:06:02 +0100
+
 moat-lib-codec (0.4.11-2) unstable; urgency=medium
 
   * New release for 26.0.0

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/pyproject.toml

@@ -13,10 +13,10 @@ classifiers = [
 ]
 dependencies = [
     "anyio ~= 4.2",
-    "moat-lib-rpc ~= 0.6.0",
+    "moat-lib-rpc ~= 0.6.1",
     "moat-lib-micro ~= 0.2.2",
     "moat-lib-proxy ~= 0.1.1",
-    "moat-util ~= 0.62.3",
+    "moat-util ~= 0.62.6",
 ]
 keywords = ["MoaT"]
 requires-python = ">=3.8"
@@ -25,7 +25,7 @@ maintainers = [{email = "matthias@urlichs.de",name = "Matthias Urlichs"}]
 description='A simple command/stream multiplexer'
 readme = "README.rst"
 authors = [{email = "matthias@urlichs.de",name = "Matthias Urlichs"}]
-version = "0.4.11"
+version = "0.4.14"
 
 [project.urls]
 homepage = "https://m-o-a-t.org"

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/src/moat/lib/codec/_base.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, overload
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -99,6 +99,11 @@ class Codec:
         raise NotImplementedError
 
 
+if TYPE_CHECKING:
+    EncoderFunc = Callable[[Codec, Any], ByteType | tuple[int, ByteType]]
+    DecoderFunc = Callable[[Codec, ByteType], Any]
+
+
 class Extension:
     def __init__(self):
         self.enc: dict[type, tuple[int | None, Callable]] = {}
@@ -110,25 +115,39 @@ class Extension:
         res.dec.update(self.dec)
         return res
 
-    def encoder(self, key: int | None, cls: type, fn=None) -> None | Callable:
-        def _enc(fn):
+    @overload
+    def encoder(self, key: int | None, cls: type) -> Callable[[EncoderFunc], EncoderFunc]: ...
+
+    @overload
+    def encoder(self, key: int | None, cls: type, fn: EncoderFunc) -> EncoderFunc: ...
+
+    def encoder(
+        self, key: int | None, cls: type, fn: EncoderFunc | None = None
+    ) -> EncoderFunc | Callable[[EncoderFunc], EncoderFunc]:
+        def _enc(fn: EncoderFunc) -> EncoderFunc:
             self.enc[cls] = (key, fn)
             return fn
 
         if fn is None:
             return _enc
-        else:
-            _enc(fn)
+        return _enc(fn)
+
+    @overload
+    def decoder(self, key: int | None) -> Callable[[DecoderFunc], DecoderFunc]: ...
+
+    @overload
+    def decoder(self, key: int | None, fn: DecoderFunc) -> DecoderFunc: ...
 
-    def decoder(self, key: int, fn=None) -> None | Callable:
-        def _dec(fn):
-            self.dec[key] = fn
+    def decoder(
+        self, key: int | None, fn: DecoderFunc | None = None
+    ) -> DecoderFunc | Callable[[DecoderFunc], DecoderFunc]:
+        def _dec(fn: DecoderFunc) -> DecoderFunc:
+            self.dec[key] = fn  # type: ignore[index]  # key can be None for catch-all
             return fn
 
         if fn is None:
             return _dec
-        else:
-            _dec(fn)
+        return _dec(fn)
 
     def encode(self, codec: Codec, obj) -> tuple[int, ByteType]:
         try:

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/src/moat/lib/codec/_cbor.py

@@ -13,10 +13,10 @@ from ._base import Codec as _Codec
 from ._base import NoCodecError
 
 # Typing
-from typing import cast, TYPE_CHECKING  # isort:skip
+from typing import TYPE_CHECKING, cast  # isort:skip
 
 try:
-    from micropython import const  # pyright:ignore
+    from micropython import const  # type: ignore[import-not-found]  # MicroPython only
 except ImportError:
 
     def const(x: int) -> int:
@@ -146,7 +146,7 @@ class Codec(_Codec):
         if self._buffer:
             raise RuntimeError("Codec is busy")
 
-        self._buffer = data  # pyright:ignore  # type mismatch
+        self._buffer = cast(bytes, data)
         try:
             res = self._dec_any()
             # chop off the part we've read
@@ -161,12 +161,12 @@ class Codec(_Codec):
         "Add additional input"
         if self._buffer and self._buf_pos < len(self._buffer):
             if self._buf_pos == 0:
-                self._buffer += data
+                self._buffer = cast(bytes, self._buffer + data)
                 return
-            data = self._buffer[self._buf_pos :] + data
-        elif isinstance(data, memoryview):
+            data = cast(bytes, self._buffer[self._buf_pos :] + data)
+        if isinstance(data, memoryview):
             data = bytearray(data)
-        self._buffer = data
+        self._buffer = cast(bytes, data)
         self._buf_pos = 0
 
     def unfeed(self, buf: VarByteType) -> int:
@@ -280,7 +280,8 @@ class Codec(_Codec):
         self._enc_any(val)
 
     def _w(self, d):
-        self._buf_out.extend(d)  # pyright:ignore[reportOptionalMemberAccess]
+        assert self._buf_out is not None  # set by encode() before calling _enc_any()
+        self._buf_out.extend(d)
 
     def _enc_any(self, ob):
         w = self._w

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/src/moat/lib/codec/_moat_msgpack.py

@@ -123,8 +123,7 @@ def _dec_marked_path(codec, data):
     codec.feed(data)
     s = iter(codec)
     mark = next(s)
-    p = Path(*s)
-    p.mark = mark
+    p = Path(*s, mark=mark)
     return p
 
 

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/src/moat/lib/codec/cbor.py

@@ -6,11 +6,14 @@ from __future__ import annotations
 
 import struct
 
-import ruyaml as yaml
+try:
+    from ruyaml import representer
+except ImportError:
+    from ruamel.yaml import representer  # fallback if ruyaml unavailable
 
 from ._cbor import CBOR_TAG_CBOR_FILEHEADER, CBOR_TAG_CBOR_LEADER, Codec, Tag  # noqa:F401
 
-SafeRepresenter = yaml.representer.SafeRepresenter  # pyright:ignore
+SafeRepresenter = representer.SafeRepresenter
 
 
 def _tag_repr(dumper, data):

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/src/moat/lib/codec/errors.py

@@ -16,7 +16,7 @@ except ImportError:
 
 
 @as_proxy("_rErrS")
-class SilentRemoteError(RemoteError):
+class SilentRemoteError(RemoteError):  # type: ignore[misc]  # RemoteError may be from two different sources
     """
     Forwarded error from a remote system.
 

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/src/moat/lib/codec/json.py

@@ -9,7 +9,7 @@ from ._base import Codec as _Codec
 try:
     from json import dumps, loads
 except ImportError:
-    from simplejson import dumps, loads
+    from simplejson import dumps, loads  # type: ignore[import-not-found]  # optional fallback
 
 
 class Codec(_Codec):

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/src/moat/lib/codec/msgpack.py

@@ -137,7 +137,7 @@ _TYPE_EXT = const(5)
 DEFAULT_RECURSE_LIMIT = 20
 
 
-_MSGPACK_HEADERS = {
+_MSGPACK_HEADERS: dict[int, tuple[int, str] | tuple[int, str, int]] = {
     0xC4: (1, "", _TYPE_BIN),
     0xC5: (2, ">H", _TYPE_BIN),
     0xC6: (4, ">I", _TYPE_BIN),
@@ -273,7 +273,7 @@ class Unpacker:
         elif b == 0xC3:
             obj = True
         elif b <= 0xC6:
-            size, fmt, typ = _MSGPACK_HEADERS[b]
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # type: ignore[misc]  # always 3-tuple for these keys
             self._reserve(size)
             if len(fmt) > 0:
                 n = struct.unpack_from(fmt, self._buffer, self._buf_pos)[0]
@@ -282,13 +282,13 @@ class Unpacker:
             self._buf_pos += size
             obj = self._read(n)
         elif b <= 0xC9:
-            size, fmt, typ = _MSGPACK_HEADERS[b]
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # type: ignore[misc]  # always 3-tuple for these keys
             self._reserve(size)
             L, n = struct.unpack_from(fmt, self._buffer, self._buf_pos)
             self._buf_pos += size
             obj = self._read(L)
         elif b <= 0xD3:
-            size, fmt = _MSGPACK_HEADERS[b]
+            size, fmt = _MSGPACK_HEADERS[b]  # type: ignore[misc]  # always 2-tuple for these keys
             self._reserve(size)
             if len(fmt) > 0:
                 obj = struct.unpack_from(fmt, self._buffer, self._buf_pos)[0]
@@ -296,12 +296,12 @@ class Unpacker:
                 obj = self._buffer[self._buf_pos]
             self._buf_pos += size
         elif b <= 0xD8:
-            size, fmt, typ = _MSGPACK_HEADERS[b]
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # type: ignore[misc]  # always 3-tuple for these keys
             self._reserve(size + 1)
             n, obj = struct.unpack_from(fmt, self._buffer, self._buf_pos)
             self._buf_pos += size + 1
         elif b <= 0xDB:
-            size, fmt, typ = _MSGPACK_HEADERS[b]
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # type: ignore[misc]  # always 3-tuple for these keys
             self._reserve(size)
             if len(fmt) > 0:
                 (n,) = struct.unpack_from(fmt, self._buffer, self._buf_pos)
@@ -310,12 +310,12 @@ class Unpacker:
             self._buf_pos += size
             obj = self._read(n)
         elif b <= 0xDD:
-            size, fmt, typ = _MSGPACK_HEADERS[b]
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # type: ignore[misc]  # always 3-tuple for these keys
             self._reserve(size)
             (n,) = struct.unpack_from(fmt, self._buffer, self._buf_pos)
             self._buf_pos += size
         else:  # if b <= 0xDF:  # can't be anything else
-            size, fmt, typ = _MSGPACK_HEADERS[b]
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # type: ignore[misc]  # always 3-tuple for these keys
             self._reserve(size)
             (n,) = struct.unpack_from(fmt, self._buffer, self._buf_pos)
             self._buf_pos += size

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/src/moat/lib/codec/yaml.py

@@ -6,6 +6,11 @@ from moat.util import yload, yprint
 
 from ._base import Codec as _Codec
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._base import ByteType
+
 
 class Codec(_Codec):
     "basic JSON codec"
@@ -24,8 +29,8 @@ class Codec(_Codec):
         "basic decoder"
         return yload(data.decode("utf-8"))
 
-    def feed(self, buffer):  # noqa: D102
-        self._buf.extend(buffer)
+    def feed(self, data: ByteType) -> None:  # noqa: D102
+        self._buf.extend(data)
 
     def __next__(self):
         i = self._buf.find(b"\n---\n")

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14/src/moat_lib_codec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-lib-codec
-Version: 0.4.11
+Version: 0.4.14
 Summary: A simple command/stream multiplexer
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Maintainer-email: Matthias Urlichs <matthias@urlichs.de>
@@ -17,8 +17,8 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: anyio~=4.2
-Requires-Dist: moat-lib-rpc~=0.6.0
+Requires-Dist: moat-lib-rpc~=0.6.1
 Requires-Dist: moat-lib-micro~=0.2.2
 Requires-Dist: moat-lib-proxy~=0.1.1
-Requires-Dist: moat-util~=0.62.3
+Requires-Dist: moat-util~=0.62.6
 Dynamic: license-file

{moat_lib_codec-0.4.11 → moat_lib_codec-0.4.14}/src/moat_lib_codec.egg-info/requires.txt

@@ -1,5 +1,5 @@
 anyio~=4.2
 moat-lib-micro~=0.2.2
 moat-lib-proxy~=0.1.1
-moat-lib-rpc~=0.6.0
-moat-util~=0.62.3
+moat-lib-rpc~=0.6.1
+moat-util~=0.62.6