omlish 0.0.0.dev261__tar.gz → 0.0.0.dev262__tar.gz

{omlish-0.0.0.dev261/omlish.egg-info → omlish-0.0.0.dev262}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev261
+Version: 0.0.0.dev262
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev261'
-__revision__ = '3c82002e38d6309590759b67148331f48f2b7149'
+__version__ = '0.0.0.dev262'
+__revision__ = 'f60701e97bc6863120aff49893615808c33e9756'
 
 
 #

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262}/omlish/c3.py

@@ -33,6 +33,7 @@
 #
 # 8. By copying, installing or otherwise using Python, Licensee agrees to be bound by the terms and conditions of this
 # License Agreement.
+import functools
 import operator
 import typing as ta
 
@@ -70,12 +71,17 @@ def merge(seqs: ta.MutableSequence[list[T]]) -> list[T]:
                 del seq[0]
 
 
+def _default_is_abstract(obj: ta.Any) -> bool:
+    return hasattr(obj, '__abstractmethods__')
+
+
 def mro(
         cls: T,
         abcs: ta.Sequence[T] | None = None,
         *,
         get_bases: ta.Callable[[T], ta.Sequence[T]] = operator.attrgetter('__bases__'),
         is_subclass: ta.Callable[[T, T], bool] = issubclass,  # type: ignore
+        is_abstract: ta.Callable[[T], bool] = _default_is_abstract,
 ) -> list[T]:
     """
     Computes the method resolution order using extended C3 linearization.
@@ -91,7 +97,7 @@ def mro(
     """
 
     for i, base in enumerate(reversed(get_bases(cls))):
-        if hasattr(base, '__abstractmethods__'):
+        if is_abstract(base):
             boundary = len(get_bases(cls)) - i
             break  # Bases up to the last explicit ABC are considered first.
     else:
@@ -109,9 +115,16 @@ def mro(
             abstract_bases.append(base)
     for base in abstract_bases:
         abcs.remove(base)
-    explicit_c3_mros = [mro(base, abcs=abcs, get_bases=get_bases, is_subclass=is_subclass) for base in explicit_bases]
-    abstract_c3_mros = [mro(base, abcs=abcs, get_bases=get_bases, is_subclass=is_subclass) for base in abstract_bases]
-    other_c3_mros = [mro(base, abcs=abcs, get_bases=get_bases, is_subclass=is_subclass) for base in other_bases]
+    rec = functools.partial(
+        mro,
+        abcs=abcs,
+        get_bases=get_bases,
+        is_subclass=is_subclass,
+        is_abstract=is_abstract,
+    )
+    explicit_c3_mros = [rec(base) for base in explicit_bases]
+    abstract_c3_mros = [rec(base) for base in abstract_bases]
+    other_c3_mros = [rec(base) for base in other_bases]
     return merge(
         [[cls]] +  # noqa
         explicit_c3_mros + abstract_c3_mros + other_c3_mros +
@@ -127,6 +140,7 @@ def compose_mro(
         get_bases: ta.Callable[[T], ta.Sequence[T]] = operator.attrgetter('__bases__'),
         is_subclass: ta.Callable[[T, T], bool] = issubclass,  # type: ignore
         get_subclasses: ta.Callable[[T], ta.Iterable[T]] = operator.methodcaller('__subclasses__'),
+        is_abstract: ta.Callable[[T], bool] = _default_is_abstract,
 ) -> list[T]:
     """
     Calculates the method resolution order for a given class *cls*.
@@ -171,4 +185,10 @@ def compose_mro(
                 if subcls not in _mro:
                     _mro.append(subcls)
 
-    return mro(cls, abcs=_mro, get_bases=get_bases, is_subclass=is_subclass)
+    return mro(
+        cls,
+        abcs=_mro,
+        get_bases=get_bases,
+        is_subclass=is_subclass,
+        is_abstract=is_abstract,
+    )

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262}/omlish/dynamic.py

@@ -100,7 +100,6 @@ class Var(ta.Generic[T]):
 
         def outer(fn):
             class Descriptor:
-
                 @staticmethod
                 @functools.wraps(fn)
                 def __call__(*args, **kwargs):  # noqa

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262}/omlish/os/deathpacts/pipe.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - why didn't this just use set_inheritable(wfd, False)?
+"""
 import os
 import typing as ta
 import weakref

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262}/omlish/os/forkhooks.py

@@ -220,8 +220,8 @@ class ProcessOriginTracker:
     def __init__(self, **kwargs: ta.Any) -> None:
         super().__init__(**kwargs)
 
-        self._process_cookie: bytes | None = self._PROCESS_COOKIE
-        self._fork_depth: int | None = get_fork_depth()
+        self._process_cookie: ta.Optional[bytes] = self._PROCESS_COOKIE
+        self._fork_depth: ta.Optional[int] = get_fork_depth()
 
     def is_in_origin_process(self) -> bool:
         return (self._PROCESS_COOKIE, get_fork_depth()) == (self._process_cookie, self._fork_depth)

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262}/omlish/os/pidfiles/manager.py

@@ -4,7 +4,6 @@ import contextlib
 import os
 import threading
 import typing as ta
-import weakref
 
 from ...lite.check import check
 from ..forkhooks import ForkHook
@@ -23,7 +22,7 @@ class _PidfileManager(ForkHook):
     """
 
     _lock: ta.ClassVar[threading.Lock] = threading.Lock()
-    _pidfile_threads: ta.ClassVar[ta.MutableMapping[Pidfile, threading.Thread]] = weakref.WeakKeyDictionary()
+    _pidfile_threads: ta.ClassVar[ta.MutableMapping[Pidfile, threading.Thread]] = {}
     _num_kills: ta.ClassVar[int] = 0
 
     @classmethod
@@ -66,8 +65,8 @@ class _PidfileManager(ForkHook):
 
         with cls._lock:
             cls._pidfile_threads[pf] = threading.current_thread()
-        try:
 
+        try:
             with pf:
                 os.set_inheritable(check.not_none(pf.fileno()), True)
                 yield pf

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262}/omlish/os/pidfiles/pidfile.py

@@ -5,6 +5,7 @@ TODO:
  - 'json pids', with code version? '.json.pid'? '.jpid'?
   - json*L* pidfiles - first line is bare int, following may be json - now `head -n1 foo.pid` not cat
 """
+import errno
 import fcntl
 import os
 import signal
@@ -68,6 +69,7 @@ class Pidfile:
         if hasattr(self, '_fd_to_dup'):
             fd = os.dup(self._fd_to_dup)
             del self._fd_to_dup
+
         else:
             ofl = os.O_RDWR
             if not self._no_create:
@@ -80,11 +82,8 @@ class Pidfile:
 
             f = os.fdopen(fd, 'r+')
 
-        except Exception:
-            try:
-                os.close(fd)
-            except Exception:  # noqa
-                pass
+        except BaseException:
+            os.close(fd)
             raise
 
         self._f = f
@@ -129,8 +128,11 @@ class Pidfile:
             fcntl.flock(self._f, fcntl.LOCK_EX | fcntl.LOCK_NB)
             return True
 
-        except OSError:
-            return False
+        except BlockingIOError as e:
+            if e.errno == errno.EAGAIN:
+                return False
+            else:
+                raise
 
     #
 

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev261
+Version: 0.0.0.dev262
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262}/omlish.egg-info/SOURCES.txt

@@ -22,7 +22,6 @@ omlish.egg-info/dependency_links.txt
 omlish.egg-info/entry_points.txt
 omlish.egg-info/requires.txt
 omlish.egg-info/top_level.txt
-omlish/_antlr/__init__.py
 omlish/algorithm/__init__.py
 omlish/algorithm/all.py
 omlish/algorithm/distribute.py

{omlish-0.0.0.dev261 → omlish-0.0.0.dev262}/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.dev261'
+version = '0.0.0.dev262'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',