omlish 0.0.0.dev389__py3-none-any.whl → 0.0.0.dev391__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev389'
-__revision__ = '5ed30f9d1e6912ba1c80e1c14f4e8d7a5998cba1'
+__version__ = '0.0.0.dev391'
+__revision__ = '9d8e80442975d9c9e6041f0fd1f201daaace73fe'
 
 
 #

omlish/formats/yaml.py

@@ -156,7 +156,7 @@ class _cached_class_property:  # noqa
             return ret
 
 
-class WrappedLoaders(lang.Namespace):
+class WrappedLoaders(lang.NotInstantiable):
     @staticmethod
     def _wrap(cls):  # noqa
         return type('NodeWrapping$' + cls.__name__, (NodeWrappingConstructorMixin, cls), {})

omlish/io/pyio.py

@@ -4,7 +4,7 @@
 """
 Python implementation of the io module.
 
-https://github.com/python/cpython/blob/8b3cccf3f9508572d85b0044519f2bd5715dacad/Lib/_pyio.py
+https://github.com/python/cpython/blob/6cb20a219a860eaf687b2d968b41c480c7461909/Lib/_pyio.py
 """
 # PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 # --------------------------------------------
@@ -255,11 +255,18 @@ def open(
     result = raw
     try:
         line_buffering = False
-        if buffering == 1 or buffering < 0 and raw._isatty_open_only():
+        if buffering == 1 or buffering < 0 and raw.isatty():
             buffering = -1
             line_buffering = True
         if buffering < 0:
-            buffering = raw._blksize
+            buffering = DEFAULT_BUFFER_SIZE
+            try:
+                bs = os.fstat(raw.fileno()).st_blksize
+            except (OSError, AttributeError):
+                pass
+            else:
+                if bs > 1:
+                    buffering = bs
         if buffering < 0:
             raise ValueError('invalid buffering size')
         if buffering == 0:
@@ -425,6 +432,9 @@ class IOBase(metaclass=abc.ABCMeta):
         if closed:
             return
 
+        if dealloc_warn := getattr(self, "_dealloc_warn", None):
+            dealloc_warn(self)
+
         # If close() fails, the caller logs the exception with sys.unraisablehook. close() must be called at the end at
         # __del__().
         self.close()
@@ -873,6 +883,10 @@ class _BufferedIOMixin(BufferedIOBase):
         else:
             return f'<{modname}.{clsname} name={name!r}>'
 
+    def _dealloc_warn(self, source):
+        if dealloc_warn := getattr(self.raw, "_dealloc_warn", None):
+            dealloc_warn(source)
+
     # Lower-level APIs
 
     def fileno(self):
@@ -1484,7 +1498,6 @@ class FileIO(RawIOBase):
 
         if self._fd >= 0:
             # Have to close the existing file first.
-            self._stat_atopen = None
             try:
                 if self._closefd:
                     os.close(self._fd)
@@ -1553,21 +1566,25 @@ class FileIO(RawIOBase):
                     if not isinstance(fd, int):
                         raise TypeError('expected integer from opener')
                     if fd < 0:
-                        raise OSError('Negative file descriptor')
+                        # bpo-27066: Raise a ValueError for bad value.
+                        raise ValueError(f'opener returned {fd}')
                 owned_fd = fd
                 if not noinherit_flag:
                     os.set_inheritable(fd, False)
 
             self._closefd = closefd
-            self._stat_atopen = os.fstat(fd)
+            fdfstat = os.fstat(fd)
             try:
-                if stat.S_ISDIR(self._stat_atopen.st_mode):
+                if stat.S_ISDIR(fdfstat.st_mode):
                     raise IsADirectoryError(
                         errno.EISDIR, os.strerror(errno.EISDIR), file,
                     )
             except AttributeError:
                 # Ignore the AttributeError if stat.S_ISDIR or errno.EISDIR don't exist.
                 pass
+            self._blksize = getattr(fdfstat, 'st_blksize', 0)
+            if self._blksize <= 1:
+                self._blksize = DEFAULT_BUFFER_SIZE
 
             self.name = file
             if self._appending:
@@ -1579,16 +1596,15 @@ class FileIO(RawIOBase):
                     if e.errno != errno.ESPIPE:
                         raise
         except:  # noqa
-            self._stat_atopen = None
             if owned_fd is not None:
                 os.close(owned_fd)
             raise
         self._fd = fd
 
-    def __del__(self):
+    def _dealloc_warn(self, source):
         if self._fd >= 0 and self._closefd and not self.closed:
-            warnings.warn('unclosed file %r' % (self,), ResourceWarning, stacklevel=2, source=self)
-            self.close()
+            import warnings
+            warnings.warn(f'unclosed file {source!r}', ResourceWarning, stacklevel=2, source=self)
 
     def __getstate__(self):
         raise TypeError(f'cannot pickle {self.__class__.__name__!r} object')
@@ -1614,17 +1630,6 @@ class FileIO(RawIOBase):
                 self._closefd,
             )
 
-    @property
-    def _blksize(self):
-        if self._stat_atopen is None:
-            return DEFAULT_BUFFER_SIZE
-
-        blksize = getattr(self._stat_atopen, 'st_blksize', 0)
-        # WASI sets blsize to 0
-        if not blksize:
-            return DEFAULT_BUFFER_SIZE
-        return blksize
-
     def _checkReadable(self):
         if not self._readable:
             raise UnsupportedOperation('File not open for reading')
@@ -1660,21 +1665,14 @@ class FileIO(RawIOBase):
 
         self._checkClosed()
         self._checkReadable()
-        if self._stat_atopen is None or self._stat_atopen.st_size <= 0:
-            bufsize = DEFAULT_BUFFER_SIZE
-        else:
-            # In order to detect end of file, need a read() of at least 1 byte which returns size 0. Oversize the buffer
-            # by 1 byte so the I/O can be completed with two read() calls (one for all data, one for EOF) without
-            # needing to resize the buffer.
-            bufsize = self._stat_atopen.st_size + 1
-
-            if self._stat_atopen.st_size > 65536:
-                try:
-                    pos = os.lseek(self._fd, 0, io.SEEK_CUR)
-                    if self._stat_atopen.st_size >= pos:
-                        bufsize = self._stat_atopen.st_size - pos + 1
-                except OSError:
-                    pass
+        bufsize = DEFAULT_BUFFER_SIZE
+        try:
+            pos = os.lseek(self._fd, 0, os.SEEK_CUR)
+            end = os.fstat(self._fd).st_size
+            if end >= pos:
+                bufsize = end - pos + 1
+        except OSError:
+            pass
 
         result = bytearray()
         while True:
@@ -1756,7 +1754,6 @@ class FileIO(RawIOBase):
         if size is None:
             size = self.tell()
         os.ftruncate(self._fd, size)
-        self._stat_atopen = None
         return size
 
     def close(self):
@@ -1767,9 +1764,8 @@ class FileIO(RawIOBase):
         """
 
         if not self.closed:
-            self._stat_atopen = None
             try:
-                if self._closefd:
+                if self._closefd and self._fd >= 0:
                     os.close(self._fd)
             finally:
                 super().close()
@@ -1811,20 +1807,6 @@ class FileIO(RawIOBase):
         self._checkClosed()
         return os.isatty(self._fd)
 
-    def _isatty_open_only(self):
-        """
-        Checks whether the file is a TTY using an open-only optimization.
-
-        TTYs are always character devices. If the interpreter knows a file is not a character device when it would call
-        ``isatty``, can skip that call. Inside ``open()``  there is a fresh stat result that contains that information.
-        Use the stat result to skip a system call. Outside of that context TOCTOU issues (the fd could be arbitrarily
-        modified by surrounding code).
-        """
-
-        if self._stat_atopen is not None and not stat.S_ISCHR(self._stat_atopen.st_mode):
-            return False
-        return os.isatty(self._fd)
-
     @property
     def closefd(self):
         """True if the file descriptor will be closed by close()."""
@@ -2583,11 +2565,8 @@ class TextIOWrapper(TextIOBase):
         decoder = self._decoder or self._get_decoder()
 
         if size < 0:
-            chunk = self.buffer.read()
-            if chunk is None:
-                raise BlockingIOError("Read returned None.")
             # Read everything.
-            result = self._get_decoded_chars() + decoder.decode(chunk, final=True)
+            result = self._get_decoded_chars() + decoder.decode(self.buffer.read(), final=True)
             if self._snapshot is not None:
                 self._set_decoded_chars('')
                 self._snapshot = None
@@ -2708,6 +2687,10 @@ class TextIOWrapper(TextIOBase):
     def newlines(self):
         return self._decoder.newlines if self._decoder else None
 
+    def _dealloc_warn(self, source):
+        if dealloc_warn := getattr(self.buffer, "_dealloc_warn", None):
+            dealloc_warn(source)
+
 
 class StringIO(TextIOWrapper):
     """

omlish/lite/maysyncs.py

@@ -11,7 +11,8 @@ import typing as ta
 
 T = ta.TypeVar('T')
 T_co = ta.TypeVar('T_co', covariant=True)
-_X = ta.TypeVar('_X')
+
+_MaysyncX = ta.TypeVar('_MaysyncX')
 
 _MaysyncGen = ta.Generator['_MaysyncOp', ta.Any, T]  # ta.TypeAlias
 
@@ -40,11 +41,11 @@ class Maysync_(abc.ABC):  # noqa
 ##
 
 
-class _Maywaitable(abc.ABC, ta.Generic[_X, T]):
+class _Maywaitable(abc.ABC, ta.Generic[_MaysyncX, T]):
     @ta.final
     def __init__(
             self,
-            x: _X,
+            x: _MaysyncX,
             *args: ta.Any,
             **kwargs: ta.Any,
     ) -> None:
@@ -115,6 +116,8 @@ class _MgMaysync(Maysync_, ta.Generic[T]):
     ) -> None:
         self.mg = mg
 
+        functools.update_wrapper(self, mg, updated=())
+
     def __get__(self, instance, owner=None):
         return _MgMaysync(
             self.mg.__get__(instance, owner),  # noqa
@@ -188,7 +191,7 @@ class _MgMaysyncFn:
     def __init__(self, m):
         self.m = m
 
-        functools.update_wrapper(self, m)
+        functools.update_wrapper(self, m, updated=())
 
     def __get__(self, instance, owner=None):
         return _MgMaysyncFn(

omlish/testing/pytest/plugins/asyncs/plugin.py

@@ -47,8 +47,6 @@ class AsyncsPlugin:
         bd: dict[str, AsyncsBackend] = {}
         for bc in backends:
             be = bc()
-            if not be.is_available():
-                continue
             bn = be.name
             check.not_in(bn, bd)
             bd[bn] = be
@@ -82,7 +80,8 @@ class AsyncsPlugin:
 
         for bn in bns:
             be = self._backends[bn]
-            be.prepare_for_metafunc(metafunc)
+            if be.is_available():
+                be.prepare_for_metafunc(metafunc)
 
         metafunc.fixturenames.append(PARAM_NAME)
         metafunc.parametrize(PARAM_NAME, bns)
@@ -139,6 +138,9 @@ class AsyncsPlugin:
         if not is_coroutine_function(testfunc):
             pytest.fail(f'test function `{item!r}` is marked asyncs but is not async')
 
+        if not backend.is_available():
+            pytest.skip(f'backend `{backend.name}` is unavailable')
+
         @backend.wrap_runner
         async def _bootstrap_fixtures_and_run_test(**kwargs):
             __tracebackhide__ = True

omlish/testing/pytest/plugins/depskip.py

@@ -98,6 +98,6 @@ def module_register(
 
     regex_register(
         pm,
-        [rf'{re.escape(m.replace(".", "/"))}/.*\.py' for m in mods],
+        [rf'{re.escape(m.replace(".", "/"))}(/.*)?\.py' for m in mods],
         [rf'{re.escape(m.replace(".", "/"))}(\..*)?' for m in imp_mods],
     )

{omlish-0.0.0.dev389.dist-info → omlish-0.0.0.dev391.dist-info}/METADATA

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

{omlish-0.0.0.dev389.dist-info → omlish-0.0.0.dev391.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=aT8yZ-Zh-9wfHl5Ym5ouiWC1i0cy7Q7RlhzavB6VLPI,8587
-omlish/__about__.py,sha256=nywiLIvIX-iNrqLzoBB2G9Oux2R2MJWTjuu4s5X9qzM,3543
+omlish/__about__.py,sha256=a6RkItgr_-dJttDWjLRSXAsJlAhjzEkuNmTdxKIRibk,3543
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -251,7 +251,7 @@ omlish/formats/pickle.py,sha256=jdp4E9WH9qVPBE3sSqbqDtUo18RbTSIiSpSzJ-IEVZw,529
 omlish/formats/props.py,sha256=rPycJ-_b76NSNc2b_dZ0F0zyKzuXK8v6K6fqcV8uCRQ,18933
 omlish/formats/repr.py,sha256=kYrNs4o-ji8nOdp6u_L3aMgBMWN1ZAZJSAWgQQfStSQ,414
 omlish/formats/xml.py,sha256=S_5txvWn8Gv4D8cS0-amxrsmvjBGap3gKMXqEkdtpss,3515
-omlish/formats/yaml.py,sha256=jGPQlTE0vSV-p0O7TJRNlf6o1uq4gx8PrHZe1ApJ_o8,7386
+omlish/formats/yaml.py,sha256=yAyozZFbHIjNwexX81pnAIcpnGbJvWCras-8ifqWKFI,7392
 omlish/formats/edn/__init__.py,sha256=H3q5B-dibXvQV8pmuWizTo6Xk75M7M0M7VPCLt86rpo,195
 omlish/formats/edn/codec.py,sha256=k6-Ra3P3Rlv6JA69-jPLI4nCe5XVes_QJbcsj5DYzMM,454
 omlish/formats/edn/lexing.py,sha256=LaIaGql9NtRlgi6bs4XhZ-wtabiUs99PoYN7_yAKMNE,6892
@@ -390,7 +390,7 @@ omlish/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/io/abc.py,sha256=M40QB2udYpCEqmlxCcHv6FlJYJY6ymmJQBlaklYv0U8,1256
 omlish/io/buffers.py,sha256=2ZAAZn-fTAtPCgtwcH_UJrSr5ZS9VNRp7yynufv0Rmk,7291
 omlish/io/fileno.py,sha256=_W3qxkIKpnabn1_7kgmKdx0IsPF3R334xWnF_TtkEj4,185
-omlish/io/pyio.py,sha256=UwtTYyFYDy050IzDP-71QH2W7RB2ZUsDFs59A_jpxAY,95438
+omlish/io/pyio.py,sha256=xmHTV-sn7QZThWCVBo6lTM7dhgsQn7m2L0DqRwdF2-8,94509
 omlish/io/trampoline.py,sha256=yM7Evz7cgWpFj97IUiHgq9jfqpsx-deTSZwGl1qOnoM,7199
 omlish/io/compress/__init__.py,sha256=fJFPT4ONfqxmsA4jR6qbMt2woIyyEgnc_qOWK9o1kII,247
 omlish/io/compress/abc.py,sha256=P9YoQX8XYoq2UfBsinKLUuwwqV1ODUIJzjTraRWGF1M,3090
@@ -478,7 +478,7 @@ omlish/lite/json.py,sha256=m0Ce9eqUZG23-H7-oOp8n1sf4fzno5vtK4AK_4Vc-Mg,706
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
 omlish/lite/marshal.py,sha256=JD_8ox5-yeIo7MZ6iipCdiVxx33So52M02AtvFlRGC8,20392
 omlish/lite/maybes.py,sha256=0p_fzb6yiOjEpvMKaQ53Q6CH1VPW1or7v7Lt1JIKcgM,4359
-omlish/lite/maysyncs.py,sha256=qPYJw9adceaoW50PqyLRomlrhxjnzLBxswjyMaUk04M,5755
+omlish/lite/maysyncs.py,sha256=ltB3CQ_zYl2PiTmHjtpeErZDFpNwj27JhO6_3xBmnfk,5852
 omlish/lite/pycharm.py,sha256=FRHGcCDo42UzZXqNwW_DkhI-6kb_CmJKPiQ8F6mYkLA,1174
 omlish/lite/reflect.py,sha256=pzOY2PPuHH0omdtglkN6DheXDrGopdL3PtTJnejyLFU,2189
 omlish/lite/reprs.py,sha256=Tiqf_ciD8FfS0ury7FcJ5G21yY342fW0vPacYlb8EO4,2014
@@ -775,7 +775,7 @@ omlish/testing/pytest/inject/__init__.py,sha256=pdRKv1HcDmJ_yArKJbYITPXXZthRSGgB
 omlish/testing/pytest/inject/harness.py,sha256=uaFDli1ovhue-kfXV5WXyLn6cVOWNQf_2vFD13r-JyQ,5700
 omlish/testing/pytest/plugins/__init__.py,sha256=ys1zXrYrNm7Uo6YOIVJ6Bd3dQo6kv387k7MbTYlqZSI,467
 omlish/testing/pytest/plugins/_registry.py,sha256=IK04KlBgiOJxKAyCCgjpX2R-9tE-btalYJkgjLc8Te8,77
-omlish/testing/pytest/plugins/depskip.py,sha256=dMrcmAHVv2-4ot6i_tvIUmENxbj-k8ov58zkhcjtd2o,3214
+omlish/testing/pytest/plugins/depskip.py,sha256=erF9Ff7lmGR8g-lNGAbU0tLTl43dLzO5e6AUwJ6p4GA,3217
 omlish/testing/pytest/plugins/logging.py,sha256=8gelEK2rho1I5XtxH0XPfJwxF0O-CAMffcXbi2ZsbBI,395
 omlish/testing/pytest/plugins/managermarks.py,sha256=i8JtdLtR1kYkgcu5lCOTXXrY5qM4TOFW0lbS1CKB1Ts,1305
 omlish/testing/pytest/plugins/pydevd.py,sha256=umbQh8Dy1kDjpvV6F9Ld9un7boEkjx90S94h5pzHhO8,846
@@ -786,7 +786,7 @@ omlish/testing/pytest/plugins/utils.py,sha256=7NZIe_AiblFEm7fIOL66up4k0sdBL3RZgj
 omlish/testing/pytest/plugins/asyncs/__init__.py,sha256=TTNhFmP_krug1973sq_bpWBTIvg68-1nbuVLSs92Z6k,41
 omlish/testing/pytest/plugins/asyncs/consts.py,sha256=0NOCkzV43dOu3u97BqYMQ4mPG8JuFncpWibkOZpCqX4,55
 omlish/testing/pytest/plugins/asyncs/fixtures.py,sha256=O0gT4jVH-4t1WYpY2j51QgsbdK8LKt4R9hOxnf74eTg,11264
-omlish/testing/pytest/plugins/asyncs/plugin.py,sha256=Z7uKL-leu3aM10hX98_bKwWEvRYE2dAPLY2RbcHq-WQ,6005
+omlish/testing/pytest/plugins/asyncs/plugin.py,sha256=cQEdInjYxXswOMexTdZTkcNpM3RKeQiKxdS7fjwIsq0,6088
 omlish/testing/pytest/plugins/asyncs/utils.py,sha256=YYh6XW_WmHnQCWw1jUMi0HOX_PkRnM-u5_dlVth2tt8,299
 omlish/testing/pytest/plugins/asyncs/backends/__init__.py,sha256=DpJGt5KA2N2pNXy59raVyJH1969M1AP80pJAqIlNEAs,359
 omlish/testing/pytest/plugins/asyncs/backends/asyncio.py,sha256=V4bPSbGRbSHuoRRMFhufqOam49oRycobtChN1eldvRI,825
@@ -895,9 +895,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev389.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev389.dist-info/METADATA,sha256=YuiaRpmbQmDNnnQ-xxr5mY0iJC-fWVgVqlOANsG00BE,18825
-omlish-0.0.0.dev389.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev389.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev389.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev389.dist-info/RECORD,,
+omlish-0.0.0.dev391.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev391.dist-info/METADATA,sha256=5_6xnSlNVHQd_t9th-Vt5lgyJkBo9FZtVJeqNOb9L4Q,18825
+omlish-0.0.0.dev391.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev391.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev391.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev391.dist-info/RECORD,,