omlish 0.0.0.dev131__tar.gz → 0.0.0.dev132__tar.gz

{omlish-0.0.0.dev131/omlish.egg-info → omlish-0.0.0.dev132}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev131
+Version: 0.0.0.dev132
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev131 → omlish-0.0.0.dev132}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev131'
-__revision__ = 'd1c2a72e639d89e78ab32d95eaa3e46bf716249c'
+__version__ = '0.0.0.dev132'
+__revision__ = '42bbc885dbebe7725637c1677372eaf79b3bc88f'
 
 
 #

{omlish-0.0.0.dev131 → omlish-0.0.0.dev132}/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-0.0.0.dev131 → omlish-0.0.0.dev132}/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-0.0.0.dev131 → omlish-0.0.0.dev132}/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-0.0.0.dev131 → omlish-0.0.0.dev132}/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 → omlish-0.0.0.dev132/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev131
+Version: 0.0.0.dev132
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev131 → omlish-0.0.0.dev132}/omlish.egg-info/SOURCES.txt

@@ -383,7 +383,6 @@ omlish/math/floats.py
 omlish/math/stats.py
 omlish/reflect/__init__.py
 omlish/reflect/inspect.py
-omlish/reflect/isinstance.py
 omlish/reflect/ops.py
 omlish/reflect/subst.py
 omlish/reflect/types.py

{omlish-0.0.0.dev131 → omlish-0.0.0.dev132}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev131'
+version = '0.0.0.dev132'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

omlish-0.0.0.dev131/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)