moat-lib-codec 0.4.16__tar.gz → 0.4.18__tar.gz

{moat_lib_codec-0.4.16/src/moat_lib_codec.egg-info → moat_lib_codec-0.4.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-lib-codec
-Version: 0.4.16
+Version: 0.4.18
 Summary: A simple command/stream multiplexer
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Maintainer-email: Matthias Urlichs <matthias@urlichs.de>

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/debian/changelog

@@ -1,3 +1,27 @@
+moat-lib-codec (0.4.18-1) unstable; urgency=medium
+
+  * New release for 26.1.10
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Thu, 23 Apr 2026 21:11:43 +0200
+
+moat-lib-codec (0.4.17-2) unstable; urgency=medium
+
+  * New release for 26.1.1
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Wed, 08 Apr 2026 20:08:52 +0200
+
+moat-lib-codec (0.4.17-1) unstable; urgency=medium
+
+  * New release for 26.0.20
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Sun, 05 Apr 2026 01:09:43 +0200
+
+moat-lib-codec (0.4.16-2) unstable; urgency=medium
+
+  * New release for 26.0.19
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Sun, 22 Mar 2026 16:05:07 +0100
+
 moat-lib-codec (0.4.16-1) unstable; urgency=medium
 
   * New release for 26.0.18

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/pyproject.toml

@@ -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.16"
+version = "0.4.18"
 
 [project.urls]
 homepage = "https://m-o-a-t.org"

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/_base.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, overload
+from typing import TYPE_CHECKING, cast, overload
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -142,7 +142,7 @@ class Extension:
         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
+            self.dec[cast(int, key)] = fn  # ty:ignore[index]  # key can be None for catch-all
             return fn
 
         if fn is None:

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/_cbor.py

@@ -17,7 +17,7 @@ from ._base import NoCodecError
 from typing import TYPE_CHECKING, cast  # isort:skip
 
 try:
-    from micropython import const  # type: ignore[import-not-found]  # MicroPython only
+    from micropython import const  # ty:ignore[unresolved-import]  # MicroPython only
 except ImportError:
 
     def const(x: int) -> int:
@@ -247,7 +247,7 @@ class Codec(_Codec):
 
     def _enc_string(self, val):
         if isinstance(val, str):
-            val = val.encode("utf8")
+            val = val.encode("utf8", "surrogateescape")
             self._enc_type_num(CBOR_TEXT, len(val))
         else:
             self._enc_type_num(CBOR_BYTES, len(val))

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/_moat_msgpack.py

@@ -56,7 +56,7 @@ def _enc_path(codec, obj):
 @std_ext.encoder(4, Proxy)
 def _enc_proxy(codec, obj):
     codec  # noqa:B018
-    return obj.name.encode("utf-8")
+    return obj.name.encode("utf-8", "surrogateescape")
 
 
 @std_ext.encoder(None, object)
@@ -66,7 +66,7 @@ def _enc_any(codec, obj):
     except KeyError:
         pass
     else:
-        return 4, name.encode("utf-8")
+        return 4, name.encode("utf-8", "surrogateescape")
 
     try:
         name = obj2name(type(obj))
@@ -82,7 +82,7 @@ def _enc_any(codec, obj):
             codec.encode(x) for x in obj.args
         )
 
-    return 4, get_proxy(obj).encode("utf-8")
+    return 4, get_proxy(obj).encode("utf-8", "surrogateescape")
 
 
 @std_ext.decoder(3)
@@ -99,7 +99,7 @@ def _dec_proxy(codec, data):
     if isinstance(data, memoryview):
         data = bytearray(data)
     try:
-        n = data.decode("utf-8")
+        n = data.decode("utf-8", "surrogateescape")
     except UnicodeError:
         n = str(data)
     try:

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/bool.py

@@ -17,11 +17,11 @@ class Codec(_Codec):
     def __init__(self, on="on", off="off", null=None, **kw):
         super().__init__(**kw)
         if on is not None:
-            self.on = on.encode("utf-8")
+            self.on = on.encode("utf-8", "surrogateescape")
         if off is not None:
-            self.off = off.encode("utf-8")
+            self.off = off.encode("utf-8", "surrogateescape")
         if null is not None:
-            self.null = null.encode("utf-8")
+            self.null = null.encode("utf-8", "surrogateescape")
 
     def encode(self, obj):
         "bool > some text"

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/cbor.py

@@ -9,7 +9,7 @@ import struct
 try:
     from ruyaml import representer
 except ImportError:
-    from ruamel.yaml import representer  # fallback if ruyaml unavailable
+    from ruamel.yaml import representer
 
 from ._cbor import CBOR_TAG_CBOR_FILEHEADER, CBOR_TAG_CBOR_LEADER, Codec, Tag  # noqa:F401
 

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/errors.py

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

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/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  # type: ignore[import-not-found]  # optional fallback
+    from simplejson import dumps, loads
 
 
 class Codec(_Codec):
@@ -22,7 +22,7 @@ class Codec(_Codec):
 
     def encode(self, obj):
         "basic encoder"
-        return dumps(obj).encode("utf-8")
+        return dumps(obj).encode("utf-8", "surrogateescape")
 
     def decode(self, data):
         "basic decoder"

moat_lib_codec-0.4.18/src/moat/lib/codec/jsonvalstr.py

@@ -0,0 +1,28 @@
+"A JSON+Value codec that uses a stringified element"
+
+from __future__ import annotations
+
+import json
+
+from .jsonvalue import Codec as _Codec
+
+
+class Codec(_Codec):
+    "JSON+Value using a stringified element"
+
+    def __init__(self, ext=None):
+        if ext is not None:
+            raise ValueError("You can't extend the JSON codec")
+        super().__init__()
+
+    def encode(self, obj):
+        "basic encoder"
+        return super().encode(json.dumps(obj))
+
+    def decode(self, data):
+        "basic decoder"
+        return json.loads(super().decode(data))
+
+    # 'feed' is not implemented:
+    # there is no reasonable incremental JSON codec out there
+    # bring your own framing …

moat_lib_codec-0.4.18/src/moat/lib/codec/jsonvalue.py

@@ -0,0 +1,26 @@
+"A JSON codec that encapsulates its data in a ``value`` element"
+
+from __future__ import annotations
+
+from .json import Codec as _Codec
+
+
+class Codec(_Codec):
+    "JSON codec with 'value' element"
+
+    def __init__(self, ext=None):
+        if ext is not None:
+            raise ValueError("You can't extend the JSON codec")
+        super().__init__()
+
+    def encode(self, obj):
+        "basic encoder"
+        return super().encode({"value": obj})
+
+    def decode(self, data):
+        "basic decoder"
+        return super().decode(data)["value"]
+
+    # 'feed' is not implemented:
+    # there is no reasonable incremental JSON codec out there
+    # bring your own framing …

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/moat_cbor.py

@@ -22,9 +22,10 @@ from ipaddress import (
 )
 
 from ._moat_cbor import Codec, std_ext
+from .cbor import CBOR_TAG_CBOR_FILEHEADER, CBOR_TAG_CBOR_LEADER, Tag
 
 # Typing
-from .cbor import CBOR_TAG_CBOR_FILEHEADER, CBOR_TAG_CBOR_LEADER, Tag
+from typing import cast
 
 __all__ = [
     "CBOR_TAG_MOAT_CHANGE",
@@ -233,9 +234,9 @@ def _dec_old_ipnetwork(codec, buf) -> IPv4Network | IPv6Network:
     codec  # noqa:B018
     if isinstance(buf, dict) and len(buf) == 1:
         mask, buf = next(iter(buf.items()))
-        if len(buf) == 4:
+        if len(cast(bytes, buf)) == 4:
             return IPv4Network((bytes(buf), mask))
-        elif len(buf) == 16:
+        elif len(cast(bytes, buf)) == 16:
             return IPv6Network((bytes(buf), mask))
 
     raise ValueError(f"invalid ipnetwork value {buf!r}")

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/msgpack.py

@@ -273,7 +273,7 @@ class Unpacker:
         elif b == 0xC3:
             obj = True
         elif b <= 0xC6:
-            size, fmt, typ = _MSGPACK_HEADERS[b]  # type: ignore[misc]  # always 3-tuple for these keys
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # ty:ignore[invalid-assignment]  # 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]  # type: ignore[misc]  # always 3-tuple for these keys
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # ty:ignore[invalid-assignment]  # 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]  # type: ignore[misc]  # always 2-tuple for these keys
+            size, fmt = _MSGPACK_HEADERS[b]  # ty:ignore[invalid-assignment]  # 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]  # type: ignore[misc]  # always 3-tuple for these keys
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # ty:ignore[invalid-assignment]  # 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]  # type: ignore[misc]  # always 3-tuple for these keys
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # ty:ignore[invalid-assignment]  # 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]  # type: ignore[misc]  # always 3-tuple for these keys
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # ty:ignore[invalid-assignment]  # 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]  # type: ignore[misc]  # always 3-tuple for these keys
+            size, fmt, typ = _MSGPACK_HEADERS[b]  # ty:ignore[invalid-assignment]  # always 3-tuple for these keys
             self._reserve(size)
             (n,) = struct.unpack_from(fmt, self._buffer, self._buf_pos)
             self._buf_pos += size
@@ -471,7 +471,7 @@ class Packer:
                 wb(obj)
                 continue
             if is_(obj, str):
-                obj = obj.encode("utf-8")  # , self._unicode_errors)
+                obj = obj.encode("utf-8", "surrogateescape")  # , self._unicode_errors)
                 n = len(obj)
                 if n <= 0x1F:
                     wb(struct.pack("B", 0xA0 + n))

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/utf8.py

@@ -36,7 +36,7 @@ class Codec(_Codec):
         "Encode UTF-8 to bytestring"
         if not isinstance(obj, str):
             raise ValueError(self, obj)  # noqa:TRY004
-        return obj.encode("utf-8")
+        return obj.encode("utf-8", "surrogateescape")
 
     def decode(self, data: ByteType) -> str:
         "Decode a bytestring to UTF-8"

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat/lib/codec/yaml.py

@@ -23,11 +23,11 @@ class Codec(_Codec):
 
     def encode(self, obj):
         "basic encoder"
-        return yprint(obj).encode("utf-8")
+        return yprint(obj).encode("utf-8", "surrogateescape")
 
     def decode(self, data):
         "basic decoder"
-        return yload(data.decode("utf-8"))
+        return yload(data.decode("utf-8", "surrogateescape"))
 
     def feed(self, data: ByteType) -> None:  # noqa: D102
         self._buf.extend(data)
@@ -36,6 +36,6 @@ class Codec(_Codec):
         i = self._buf.find(b"\n---\n")
         if i < 0:
             raise StopIteration
-        res = yload(self._buf[0 : i + 1].decode("utf-8"))
+        res = yload(self._buf[0 : i + 1].decode("utf-8", "surrogateescape"))
         self._buf[0 : i + 5] = b""
         return res

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18/src/moat_lib_codec.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-lib-codec
-Version: 0.4.16
+Version: 0.4.18
 Summary: A simple command/stream multiplexer
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Maintainer-email: Matthias Urlichs <matthias@urlichs.de>

{moat_lib_codec-0.4.16 → moat_lib_codec-0.4.18}/src/moat_lib_codec.egg-info/SOURCES.txt

@@ -17,6 +17,8 @@ src/moat/lib/codec/bool.py
 src/moat/lib/codec/cbor.py
 src/moat/lib/codec/errors.py
 src/moat/lib/codec/json.py
+src/moat/lib/codec/jsonvalstr.py
+src/moat/lib/codec/jsonvalue.py
 src/moat/lib/codec/moat_cbor.py
 src/moat/lib/codec/moat_kv.py
 src/moat/lib/codec/moat_msgpack.py