omlish 0.0.0.dev261__py3-none-any.whl → 0.0.0.dev262__py3-none-any.whl

omlish/__about__.py

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

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/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/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/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/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/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.dist-info → omlish-0.0.0.dev262.dist-info}/METADATA

@@ -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.dist-info → omlish-0.0.0.dev262.dist-info}/RECORD

@@ -1,18 +1,17 @@
 omlish/.manifests.json,sha256=x26AIwDzScUvnX-p4xlq6Zc5QYrAo0Vmgf1qHc1KL_M,8253
-omlish/__about__.py,sha256=ZHsfTvh2tqA6F3h9CJiRPE2DyXkN-QqoPblX54bfc2A,3380
+omlish/__about__.py,sha256=BXH7qKqT5OctoZyedUgGC-oA114ZNwHwtmurxgA2dUE,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
-omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
+omlish/c3.py,sha256=A9uZG39e7093HTWToNKZ91cFVTCbAVySgl3nShTGqVY,8409
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
 omlish/check.py,sha256=THqm6jD1a0skAO5EC8SOVg58yq96Vk5wcuruBkCYxyU,2016
 omlish/datetimes.py,sha256=HajeM1kBvwlTa-uR1TTZHmZ3zTPnnUr1uGGQhiO1XQ0,2152
 omlish/defs.py,sha256=9uUjJuVIbCBL3g14fyzAp-9gH935MFofvlfOGwcBIaM,4913
-omlish/dynamic.py,sha256=xQ8LlOt_fUPApg-yz7-gNq8JdVgTqJ0_R6vhJq2WbpI,6522
+omlish/dynamic.py,sha256=Zymfvti3LSM6BR8YjuSYRYfKiojEgrGUpqaEAOJ8lEw,6521
 omlish/libc.py,sha256=8K4c66YV1ziJerl5poAAYCmsV-VSsHkT3EHhPW04ufg,15639
 omlish/metadata.py,sha256=HvZ6ItMpEmnE-X2d5Q6J17sBiG_qOyWB8DJrS9RFZpY,3604
 omlish/runmodule.py,sha256=PWvuAaJ9wQQn6bx9ftEL3_d04DyotNn8dR_twm2pgw0,700
 omlish/shlex.py,sha256=bsW2XUD8GiMTUTDefJejZ5AyqT1pTgWMPD0BMoF02jE,248
 omlish/sync.py,sha256=-2gVJZFl8hvp7jvrnX8GcZVOecqAym6AcyK1QtMR9Ic,2979
-omlish/_antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/algorithm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/algorithm/all.py,sha256=FudUHwoaRLNNmqYM3jhP2Yd2BpmYhNBRPaVZzARMoSc,194
 omlish/algorithm/distribute.py,sha256=kO60F7HtMF3j-IxuhJdtsfgIR1Vpf1okQfacb4eNukQ,1533
@@ -542,7 +541,7 @@ omlish/os/deathsig.py,sha256=hk9Yq2kyDdI-cI7OQH7mOfpRbOKzY_TfPKEqgrjVYbA,641
 omlish/os/fcntl.py,sha256=riQf9iEEEIC28lJp8ud06MU56w2XJHJ9nBFtck_hdhc,1501
 omlish/os/filemodes.py,sha256=ZIk6XpPw2oyoytSsuVmBXQ6fvMDHzctNEDIA2uHTBC4,4575
 omlish/os/files.py,sha256=WJ_42vsZIZukQURN3TTccp-n74ZNhbux_ps3TLbHj18,1106
-omlish/os/forkhooks.py,sha256=yjodOvs90ClXskv5oBIJbHn0Y7dzajLmZmOpRMKbyxM,5656
+omlish/os/forkhooks.py,sha256=STzhEuV7oOegfqlq1DJIhESO1icMzgat0V9m02Ubky8,5668
 omlish/os/journald.py,sha256=2nI8Res1poXkbLc31--MPUlzYMESnCcPUkIxDOCjZW0,3903
 omlish/os/linux.py,sha256=whJ6scwMKSFBdXiVhJW0BCpJV4jOGMr-a_a3Bhwz6Ls,18938
 omlish/os/mangle.py,sha256=M0v-SDt4TMnL68I45GekQrUaXkTIILXIlPdqRxKBTKM,524
@@ -553,12 +552,12 @@ omlish/os/temp.py,sha256=P97KiVeNB7rfGn4tlgU5ro86JUxAsiphLMlxsjQgfB0,1198
 omlish/os/deathpacts/__init__.py,sha256=IFJkHVWff-VhBbQX38th1RlmjUF2ptKh5TPIzP9Ei2M,229
 omlish/os/deathpacts/base.py,sha256=EGN3BWSXPv0s9kl_QLrWE31hTybDHCmsLc_w3U2VyHc,1740
 omlish/os/deathpacts/heartbeatfile.py,sha256=OybdvhM2kxBTuoJWOJJ5LcX-0lg3jTOvvD2HUunxDWU,1731
-omlish/os/deathpacts/pipe.py,sha256=ZH-l-fIKyurocCehqOgvaYRurxIEMWe8D7l2dsJeGws,3214
+omlish/os/deathpacts/pipe.py,sha256=mfN2UGsOaEmoh4jHi6D0vnjg420pNsyctb3ZTcNsdqI,3285
 omlish/os/pidfiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/os/pidfiles/__main__.py,sha256=AF8TwjK4xgHVnoLAP9dIWgKvT0vGhHJlfDW0tKZ7tx4,200
 omlish/os/pidfiles/cli.py,sha256=2SSsP4O3VdpsDIMAkWgWSjh_YNIPzCD9l5LNN2qrIjo,2074
-omlish/os/pidfiles/manager.py,sha256=qSEwNaWT1KOAnU0KxliwvU_uowme5jyf1FyIPsGwnTY,2391
-omlish/os/pidfiles/pidfile.py,sha256=v0p5NTW8tFv1frCBzgjRkXnljsw8PQ1exfc7kjZJ5L8,4359
+omlish/os/pidfiles/manager.py,sha256=QphQxIENVVwvBWynLCNU31NwOfLkV43VoTVeYFn2Hac,2351
+omlish/os/pidfiles/pidfile.py,sha256=9tI5IMVwfPfnni0XMn4x5ptNQgm36n8tLeUNPf50UqU,4394
 omlish/os/pidfiles/pinning.py,sha256=v9RlJ4BnJZcaZZXiiRqbmzLluaSOkeeEb_WrbKEClBQ,6643
 omlish/reflect/__init__.py,sha256=Er2yBHibVO16hFNA1szQF2_f43Y3HRCBWtS-fjsOIYc,798
 omlish/reflect/inspect.py,sha256=WCo2YpBYauKw6k758FLlZ_H4Q05rgVPs96fEv9w6zHQ,1538
@@ -768,9 +767,9 @@ omlish/text/parts.py,sha256=Q9NvoyEGQKIWgiPD4D_Qc66cWAuyEKE033dT9m7c3Wk,6662
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
 omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=N9EYdnFdEX_A8fOviH-1w4jwV3XOQ7VU2WsoUNubYVY,9137
-omlish-0.0.0.dev261.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev261.dist-info/METADATA,sha256=O7gGUkhbgsi0XRUcwynTYxv1lgYqSKk6-UQI4Y9hCkQ,4198
-omlish-0.0.0.dev261.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-omlish-0.0.0.dev261.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev261.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev261.dist-info/RECORD,,
+omlish-0.0.0.dev262.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev262.dist-info/METADATA,sha256=LFyiHfPhM7912bihwnUNvFuGoCgIqW8_Pg9F4Ih5zUs,4198
+omlish-0.0.0.dev262.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+omlish-0.0.0.dev262.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev262.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev262.dist-info/RECORD,,