moat-kv-ow 0.9.5__py3-none-any.whl → 0.9.7__py3-none-any.whl

moat/kv/ow/_main.py

@@ -47,7 +47,7 @@ async def list_(obj, device, family):
         def pm(p):
             if len(p) < 1:
                 return path
-            return Path("%02x.%12x" % (f, p[0]), *p[1:])
+            return Path(f"{f:02x}.{p[0]:12x}", *p[1:])
 
     elif device:
         f, d = device.split(".", 2)[0:2]
@@ -67,7 +67,7 @@ async def list_(obj, device, family):
             elif len(p) == 1:
                 return Path("%02x" % p[0])
             else:
-                return Path("%02x.%12x" % (p[0], p[1])) + p[2:]
+                return Path(f"{p[0]:02x}.{p[1]:12x}") + p[2:]
 
     if obj.meta:
 

moat/kv/ow/mock.py

@@ -6,6 +6,7 @@ from asyncowfs.mock import some_server
 from moat.util import ensure_cfg
 
 from .task import task
+import contextlib
 
 PORT = ((os.getpid() + 101) % 9999) + 40000
 
@@ -19,10 +20,8 @@ async def server(client, tree={}, options={}, evt=None):  # pylint: disable=dang
         )
 
         async def may_close():
-            try:
+            with contextlib.suppress(anyio.ClosedResourceError, anyio.BrokenResourceError):
                 await listener.serve(partial(some_server, tree, options))
-            except (anyio.ClosedResourceError, anyio.BrokenResourceError):
-                pass
 
         addr = listener.extra(anyio.abc.SocketAttribute.raw_socket).getsockname()
         tg.start_soon(may_close)

moat/kv/ow/model.py

@@ -315,7 +315,7 @@ class OWFSroot(ClientRoot):
             class FamilyX(OWFSfamily):
                 cls = kls.reg.get(name, OWFSnode)
 
-            FamilyX.__name__ = "OWFSfamily_%02X" % (name,)
+            FamilyX.__name__ = f"OWFSfamily_{name:02X}"
             kls.cls[name] = FamilyX
             return FamilyX
 

moat/kv/ow/task.py

@@ -74,7 +74,7 @@ async def task(client, cfg, server=None, evt=None):
     async with OWFS() as ow:
         hd = await OWFSroot.as_handler(client)
         await ow.add_task(mon, ow, hd)
-        port = cfg.ow.port
+        port = cfg.kv.ow.port
         if not server:
             si = ((s._name, s) for s in hd.server)
         elif isinstance(server, str):

{moat_kv_ow-0.9.5.dist-info → moat_kv_ow-0.9.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-kv-ow
-Version: 0.9.5
+Version: 0.9.7
 Summary: 1wire connector for MoaT-KV
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org
@@ -14,7 +14,7 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
-Requires-Dist: moat-kv~=0.70.23
+Requires-Dist: moat-kv~=0.70.24
 Dynamic: license-file
 
 ==========

moat_kv_ow-0.9.7.dist-info/RECORD

@@ -0,0 +1,11 @@
+moat/kv/ow/__init__.py,sha256=ZBoFcXbv35djD599Vo_PKTqDjvQXYYXTcPUs5RcQZrs,101
+moat/kv/ow/_cfg.yaml,sha256=dzidXt6m_1zw2fPaYGRjvV5aJ8rasBXeTXFpH1ZAMMk,40
+moat/kv/ow/_main.py,sha256=6PSIYX05bODbSBP6cceYk-oQsw8lpwBFrcvQ0yq3-_E,6465
+moat/kv/ow/mock.py,sha256=TO6wKM_K0WBYAw5U6kuwDsbNePGucsI6qr7TVo8C30E,1166
+moat/kv/ow/model.py,sha256=FdUkaIwRF1inKBOHC_0BuDCrVaSiSVyCowgOHNWVwCM,10404
+moat/kv/ow/task.py,sha256=ZvHuZRwV3oPwrzMsVhWAc-_y9hV4f1RcP8srvNnj7ao,2689
+moat_kv_ow-0.9.7.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
+moat_kv_ow-0.9.7.dist-info/METADATA,sha256=uo5ybI8GXDXs_futaXurdtENjqCEWHsRbdYSWw4bEgE,961
+moat_kv_ow-0.9.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+moat_kv_ow-0.9.7.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
+moat_kv_ow-0.9.7.dist-info/RECORD,,

{moat_kv_ow-0.9.5.dist-info → moat_kv_ow-0.9.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3.post20250321)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

moat_kv_ow-0.9.5.dist-info/RECORD

@@ -1,11 +0,0 @@
-moat/kv/ow/__init__.py,sha256=ZBoFcXbv35djD599Vo_PKTqDjvQXYYXTcPUs5RcQZrs,101
-moat/kv/ow/_cfg.yaml,sha256=dzidXt6m_1zw2fPaYGRjvV5aJ8rasBXeTXFpH1ZAMMk,40
-moat/kv/ow/_main.py,sha256=aoOHqJu5Y2vAcRm_xBbqqi6m7Svx1xniKKkD276g8fg,6469
-moat/kv/ow/mock.py,sha256=qBUiwOpeB096EXaBfT-yZ74Q9uzsAQ4_5nDgWMm64tM,1169
-moat/kv/ow/model.py,sha256=yQpnxtyjVuuRKkUSw8rLGlzQkfyy3jy6tvLLr9JwlYc,10407
-moat/kv/ow/task.py,sha256=tZjkFRhF4WjEHr_zZVy8eFabGOCWO_Cx2vMrn6Q6rGo,2686
-moat_kv_ow-0.9.5.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
-moat_kv_ow-0.9.5.dist-info/METADATA,sha256=X3IT-9KMjTTgSuSjOBWjGFczkgplwzwGcsZ1sUIsmFA,961
-moat_kv_ow-0.9.5.dist-info/WHEEL,sha256=xcaH6rP_nCxh1LBIPM7Q0uOnzSGjsIye-Q44j_zbzw8,104
-moat_kv_ow-0.9.5.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
-moat_kv_ow-0.9.5.dist-info/RECORD,,