omlish 0.0.0.dev131__py3-none-any.whl → 0.0.0.dev133__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev131'
-__revision__ = 'd1c2a72e639d89e78ab32d95eaa3e46bf716249c'
+__version__ = '0.0.0.dev133'
+__revision__ = 'a351cfd2f4211dfabf34e559ec14459081ef5895'
 
 
 #
@@ -51,7 +51,7 @@ class Project(ProjectBase):
         ],
 
         'diag': [
-            'asttokens ~= 2.4',
+            'asttokens ~= 3.0',
             'executing ~= 2.1',
 
             'psutil ~= 6.0',
@@ -71,7 +71,7 @@ class Project(ProjectBase):
         ],
 
         'http': [
-            'httpx[http2] ~= 0.27',
+            'httpx[http2] ~= 0.28',
         ],
 
         'misc': [

omlish/lite/contextmanagers.py

@@ -39,6 +39,14 @@ class ExitStacked:
 ##
 
 
+@contextlib.contextmanager
+def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
+    try:
+        yield fn
+    finally:
+        fn()
+
+
 @contextlib.contextmanager
 def attr_setting(obj, attr, val, *, default=None):  # noqa
     not_set = object()

omlish/lite/fdio/kqueue.py

@@ -47,19 +47,40 @@ if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
         #
 
         def _register_readable(self, fd: int) -> None:
-            self._control(fd, select.KQ_FILTER_READ, select.KQ_EV_ADD)
+            self._update_registration(fd, 'read', 'add')
 
         def _register_writable(self, fd: int) -> None:
-            self._control(fd, select.KQ_FILTER_WRITE, select.KQ_EV_ADD)
+            self._update_registration(fd, 'write', 'add')
 
         def _unregister_readable(self, fd: int) -> None:
-            self._control(fd, select.KQ_FILTER_READ, select.KQ_EV_DELETE)
+            self._update_registration(fd, 'read', 'del')
 
         def _unregister_writable(self, fd: int) -> None:
-            self._control(fd, select.KQ_FILTER_WRITE, select.KQ_EV_DELETE)
+            self._update_registration(fd, 'write', 'del')
 
-        def _control(self, fd: int, filter: int, flags: int) -> None:  # noqa
-            ke = select.kevent(fd, filter=filter, flags=flags)
+        #
+
+        _CONTROL_FILTER_BY_READ_OR_WRITE: ta.ClassVar[ta.Mapping[ta.Literal['read', 'write'], int]] = {
+            'read': select.KQ_FILTER_READ,
+            'write': select.KQ_FILTER_WRITE,
+        }
+
+        _CONTROL_FLAGS_BY_ADD_OR_DEL: ta.ClassVar[ta.Mapping[ta.Literal['add', 'del'], int]] = {
+            'add': select.KQ_EV_ADD,
+            'del': select.KQ_EV_DELETE,
+        }
+
+        def _update_registration(
+                self,
+                fd: int,
+                read_or_write: ta.Literal['read', 'write'],
+                add_or_del: ta.Literal['add', 'del'],
+        ) -> None:  # noqa
+            ke = select.kevent(
+                fd,
+                filter=self._CONTROL_FILTER_BY_READ_OR_WRITE[read_or_write],
+                flags=self._CONTROL_FLAGS_BY_ADD_OR_DEL[add_or_del],
+            )
             kq = self._get_kqueue()
             try:
                 kq.control([ke], 0)
@@ -70,7 +91,8 @@ if sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
                     pass
                 elif exc.errno == errno.ENOENT:
                     # Can happen when trying to remove an already closed socket
-                    pass
+                    if add_or_del == 'add':
+                        raise
                 else:
                     raise
 

omlish/lite/fdio/pollers.py

@@ -42,16 +42,16 @@ class FdIoPoller(abc.ABC):
     def register_readable(self, fd: int) -> bool:
         if fd in self._readable:
             return False
-        self._readable.add(fd)
         self._register_readable(fd)
+        self._readable.add(fd)
         return True
 
     @ta.final
     def register_writable(self, fd: int) -> bool:
         if fd in self._writable:
             return False
-        self._writable.add(fd)
         self._register_writable(fd)
+        self._writable.add(fd)
         return True
 
     @ta.final
@@ -155,24 +155,24 @@ if hasattr(select, 'poll'):
 
         #
 
-        _READ = select.POLLIN | select.POLLPRI | select.POLLHUP
-        _WRITE = select.POLLOUT
-
         def _register_readable(self, fd: int) -> None:
-            self._update_registration(fd)
+            self._update_registration(fd, r=True, w=fd in self._writable)
 
         def _register_writable(self, fd: int) -> None:
-            self._update_registration(fd)
+            self._update_registration(fd, r=fd in self._readable, w=True)
 
         def _unregister_readable(self, fd: int) -> None:
-            self._update_registration(fd)
+            self._update_registration(fd, r=False, w=False)
 
         def _unregister_writable(self, fd: int) -> None:
-            self._update_registration(fd)
+            self._update_registration(fd, r=fd in self._readable, w=False)
+
+        #
+
+        _READ = select.POLLIN | select.POLLPRI | select.POLLHUP
+        _WRITE = select.POLLOUT
 
-        def _update_registration(self, fd: int) -> None:
-            r = fd in self._readable
-            w = fd in self._writable
+        def _update_registration(self, fd: int, *, r: bool, w: bool) -> None:
             if r or w:
                 self._poller.register(fd, (self._READ if r else 0) | (self._WRITE if w else 0))
             else:

omlish/reflect/__init__.py

@@ -2,11 +2,6 @@ from .inspect import (  # noqa
     get_annotations,
 )
 
-from .isinstance import (  # noqa
-    KNOWN_ISINSTANCE_GENERICS,
-    isinstance_of,
-)
-
 from .ops import (  # noqa
     get_concrete_type,
     get_underlying,

{omlish-0.0.0.dev131.dist-info → omlish-0.0.0.dev133.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev131
+Version: 0.0.0.dev133
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -21,7 +21,7 @@ Requires-Dist: trio-asyncio~=0.15; extra == "all"
 Requires-Dist: lz4~=4.3; extra == "all"
 Requires-Dist: python-snappy~=0.7; extra == "all"
 Requires-Dist: zstandard~=0.23; extra == "all"
-Requires-Dist: asttokens~=2.4; extra == "all"
+Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.1; extra == "all"
 Requires-Dist: psutil~=6.0; extra == "all"
 Requires-Dist: orjson~=3.10; extra == "all"
@@ -30,7 +30,7 @@ Requires-Dist: json5~=0.9; extra == "all"
 Requires-Dist: pyyaml~=6.0; extra == "all"
 Requires-Dist: cbor2~=5.6; extra == "all"
 Requires-Dist: cloudpickle~=3.1; extra == "all"
-Requires-Dist: httpx[http2]~=0.27; extra == "all"
+Requires-Dist: httpx[http2]~=0.28; extra == "all"
 Requires-Dist: wrapt~=1.14; extra == "all"
 Requires-Dist: cryptography~=43.0; extra == "all"
 Requires-Dist: sqlalchemy[asyncio]~=2.0; extra == "all"
@@ -45,7 +45,7 @@ Requires-Dist: duckdb~=1.1; extra == "all"
 Requires-Dist: pytest~=8.0; extra == "all"
 Requires-Dist: anyio~=4.6; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
-Requires-Dist: asttokens~=2.4; extra == "all"
+Requires-Dist: asttokens~=3.0; extra == "all"
 Requires-Dist: executing~=2.1; extra == "all"
 Requires-Dist: orjson~=3.10; extra == "all"
 Requires-Dist: pyyaml~=6.0; extra == "all"
@@ -61,7 +61,7 @@ Requires-Dist: lz4~=4.3; extra == "compress"
 Requires-Dist: python-snappy~=0.7; extra == "compress"
 Requires-Dist: zstandard~=0.23; extra == "compress"
 Provides-Extra: diag
-Requires-Dist: asttokens~=2.4; extra == "diag"
+Requires-Dist: asttokens~=3.0; extra == "diag"
 Requires-Dist: executing~=2.1; extra == "diag"
 Requires-Dist: psutil~=6.0; extra == "diag"
 Provides-Extra: formats
@@ -72,7 +72,7 @@ Requires-Dist: pyyaml~=6.0; extra == "formats"
 Requires-Dist: cbor2~=5.6; extra == "formats"
 Requires-Dist: cloudpickle~=3.1; extra == "formats"
 Provides-Extra: http
-Requires-Dist: httpx[http2]~=0.27; extra == "http"
+Requires-Dist: httpx[http2]~=0.28; extra == "http"
 Provides-Extra: misc
 Requires-Dist: wrapt~=1.14; extra == "misc"
 Provides-Extra: secrets
@@ -93,7 +93,7 @@ Requires-Dist: pytest~=8.0; extra == "testing"
 Provides-Extra: plus
 Requires-Dist: anyio~=4.6; extra == "plus"
 Requires-Dist: sniffio~=1.3; extra == "plus"
-Requires-Dist: asttokens~=2.4; extra == "plus"
+Requires-Dist: asttokens~=3.0; extra == "plus"
 Requires-Dist: executing~=2.1; extra == "plus"
 Requires-Dist: orjson~=3.10; extra == "plus"
 Requires-Dist: pyyaml~=6.0; extra == "plus"

{omlish-0.0.0.dev131.dist-info → omlish-0.0.0.dev133.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=CxGnj-UiRPlZgmgWoovDWrOnqpSEmBy_kqA7cdfSA3w,1431
-omlish/__about__.py,sha256=d7BMVkW2N3aBZ6Tdsm0Fd2b0CcKLA6TPpoZPJHMAGDM,3379
+omlish/__about__.py,sha256=Tilu--8fQmtMb42XpjYRk2DDowEQW1wSoTUKrA-9S7s,3379
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/argparse.py,sha256=cqKGAqcxuxv_s62z0gq29L9KAvg_3-_rFvXKjVpRJjo,8126
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
@@ -301,7 +301,7 @@ omlish/lifecycles/transitions.py,sha256=qQtFby-h4VzbvgaUqT2NnbNumlcOx9FVVADP9t83
 omlish/lite/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omlish/lite/cached.py,sha256=Fs-ljXVJmHBjAaHc-JuJXMEV4MNSX5c_KHZIM3AEaIw,694
 omlish/lite/check.py,sha256=pQC412ffe_Zh7eHa4C1UYn6fA71Ls1vpVM0ZIOroPAY,1765
-omlish/lite/contextmanagers.py,sha256=_jfNdpYvxkbKwyjQLbK-o69W89GoEuUfl_NrCosE9lU,1308
+omlish/lite/contextmanagers.py,sha256=DRarS2gx15tbse1YzyI8ZLdBmWYjFgmKPe-i4CSNDYg,1458
 omlish/lite/docker.py,sha256=3IVZZtIm7-UdB2SwArmN_MosTva1_KifyYp3YWjODbE,337
 omlish/lite/inject.py,sha256=aRRmFb6azTKF208ogYwVCEopNZx7496Ta1GZmL_IKBA,23716
 omlish/lite/io.py,sha256=3ECgUXdRnXyS6pGTSoVr6oB4moI38EpWxTq08zaTM-U,5339
@@ -322,9 +322,9 @@ omlish/lite/typing.py,sha256=U3-JaEnkDSYxK4tsu_MzUn3RP6qALBe5FXQXpD-licE,1090
 omlish/lite/fdio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/lite/fdio/corohttp.py,sha256=5kzuM1cssA2D7rfknHFxylpjBNfA5tQSPkIRY2Ilapo,3825
 omlish/lite/fdio/handlers.py,sha256=ukUiwF8-UCr4mzTTfOaTipC0k3k7THiHnohVdYfH69o,1341
-omlish/lite/fdio/kqueue.py,sha256=4SvSMwNdkXpQbkMhyLqiZIjFGPUGSgD22yr9mpxT2fk,3153
+omlish/lite/fdio/kqueue.py,sha256=lIWvvRpRyak0dmzE6FPtCdS02HGo0EEI0D1g8cWyLYk,3832
 omlish/lite/fdio/manager.py,sha256=-gMVzk4B1YTZS-d2TdM12woUme37pcNVUxNTiLe91lA,1250
-omlish/lite/fdio/pollers.py,sha256=zSFi19SGQ2WKtMO_ONiqaJ_mbQmhrK59zgH5CqMYcu8,5434
+omlish/lite/fdio/pollers.py,sha256=d73P2ynzFdQZhmxhMKghzO6zvLwzTMSaIgBi7wQ5IQs,5507
 omlish/lite/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/lite/http/coroserver.py,sha256=aBaYjP80yQHQxPxwi7PTYHub-fdRDKsMnB-tM8lBc2o,18095
 omlish/lite/http/handlers.py,sha256=Yu0P3nqz-frklwCM2PbiWvoJNE-NqeTFLBvpNpqcdtA,753
@@ -371,9 +371,8 @@ omlish/math/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/math/bits.py,sha256=yip1l8agOYzT7bFyMGc0RR3XlnGCfHMpjw_SECLLh1I,3477
 omlish/math/floats.py,sha256=UimhOT7KRl8LXTzOI5cQWoX_9h6WNWe_3vcOuO7-h_8,327
 omlish/math/stats.py,sha256=MegzKVsmv2kra4jDWLOUgV0X7Ee2Tbl5u6ql1v4-dEY,10053
-omlish/reflect/__init__.py,sha256=3XME1VdOmmf8Qp3e8iTcqmRw6rzFzE3HQbM8fMNqY44,807
+omlish/reflect/__init__.py,sha256=4-EuCSX1qpEWfScCFzAJv_XghHFu4cXxpxKeBKrosQ4,720
 omlish/reflect/inspect.py,sha256=veJ424-9oZrqyvhVpvxOi7hcKW-PDBkdYL2yjrFlk4o,495
-omlish/reflect/isinstance.py,sha256=x5T9S2634leinBT4hl3CZZkRttvdvvlxChkC_x9Qu2s,1176
 omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
 omlish/reflect/subst.py,sha256=JM2RGv2-Rcex8wCqhmgvRG59zD242P9jM3O2QLjKWWo,3586
 omlish/reflect/types.py,sha256=B1zbq3yHo6B5JeNOXbmaxm78kqZTRb_4jIWY5GxzY4Q,8155
@@ -488,9 +487,9 @@ omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,329
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev131.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev131.dist-info/METADATA,sha256=V7J6J12IhBiLRFrCaAkvQgvB1VPvsZSzu32VsYQGSdE,4173
-omlish-0.0.0.dev131.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omlish-0.0.0.dev131.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev131.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev131.dist-info/RECORD,,
+omlish-0.0.0.dev133.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev133.dist-info/METADATA,sha256=g1UGdUXjw3xU7TVb-eOTtKUn81LYmIoKNIig-b71oRc,4173
+omlish-0.0.0.dev133.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omlish-0.0.0.dev133.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev133.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev133.dist-info/RECORD,,

omlish/reflect/isinstance.py

@@ -1,38 +0,0 @@
-import collections.abc
-import typing as ta
-
-from .ops import get_underlying
-from .types import Generic
-from .types import NewType
-from .types import Type
-from .types import Union
-
-
-KNOWN_ISINSTANCE_GENERICS: ta.AbstractSet[type] = frozenset([
-    collections.abc.Mapping,
-    collections.abc.Sequence,
-    collections.abc.Set,
-])
-
-
-def isinstance_of(rfl: Type) -> ta.Callable[[ta.Any], bool]:
-    if isinstance(rfl, type):
-        return lambda o: isinstance(o, rfl)
-
-    if isinstance(rfl, NewType):
-        return isinstance_of(get_underlying(rfl))
-
-    if isinstance(rfl, Union):
-        fns = [isinstance_of(a) for a in rfl.args]
-        return lambda o: any(fn(o) for fn in fns)
-
-    if isinstance(rfl, Generic):
-        if rfl.cls in (collections.abc.Sequence, collections.abc.Set):
-            [efn] = map(isinstance_of, rfl.args)
-            return lambda o: isinstance(o, rfl.cls) and all(efn(e) for e in o)  # type: ignore
-
-        if rfl.cls == collections.abc.Mapping:
-            kfn, vfn = map(isinstance_of, rfl.args)
-            return lambda o: isinstance(o, rfl.cls) and all(kfn(k) and vfn(v) for k, v in o.items())  # type: ignore
-
-    raise TypeError(rfl)