omlish 0.0.0.dev425__tar.gz → 0.0.0.dev426__tar.gz

{omlish-0.0.0.dev425/omlish.egg-info → omlish-0.0.0.dev426}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev425
+Version: 0.0.0.dev426
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -296,7 +296,7 @@ examples are:
 - **wrapt** - For (optionally-enabled) injector circular proxies.
 - **greenlet** - For some gnarly stuff like the
   [sync<->async bridge](https://github.com/wrmsr/omlish/blob/master/omlish/asyncs/bridge.py) and the
-  [io trampoline](https://github.com/wrmsr/omlish/blob/master/omlish/io/trampoline.py).
+  [io trampoline](https://github.com/wrmsr/omlish/blob/master/omextra/io/trampoline.py).
 - **sqlalchemy** - Parts of the codebase use SQLAlchemy for db stuff, but it is being migrated away from in favor of the
   internal api. It will however likely still remain as an optional dep for the api adapter.
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/README.md

@@ -187,7 +187,7 @@ examples are:
 - **wrapt** - For (optionally-enabled) injector circular proxies.
 - **greenlet** - For some gnarly stuff like the
   [sync<->async bridge](https://github.com/wrmsr/omlish/blob/master/omlish/asyncs/bridge.py) and the
-  [io trampoline](https://github.com/wrmsr/omlish/blob/master/omlish/io/trampoline.py).
+  [io trampoline](https://github.com/wrmsr/omlish/blob/master/omextra/io/trampoline.py).
 - **sqlalchemy** - Parts of the codebase use SQLAlchemy for db stuff, but it is being migrated away from in favor of the
   internal api. It will however likely still remain as an optional dep for the api adapter.
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev425'
-__revision__ = '92376f181ba36a2d1eda16643d70fd1077e309f1'
+__version__ = '0.0.0.dev426'
+__revision__ = '94f5fd2fe7124da5d9b5af104cba12b1bbdb3286'
 
 
 #

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/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 abc
 import functools
 import operator
 import typing as ta
@@ -75,7 +76,9 @@ def merge(seqs: ta.MutableSequence[list[T]]) -> list[T]:
 
 
 def _default_is_abstract(obj: ta.Any) -> bool:
-    return hasattr(obj, '__abstractmethods__')
+    # .lite.abstracts.Abstract has '__abstractmethods__' but is not an ABCMeta, and thus for the purposes of c3 mro are
+    # not considered 'abstract'. What 'abstract' means in this context is 'can have virtual subclasses'.
+    return hasattr(obj, '__abstractmethods__') and isinstance(obj, abc.ABCMeta)
 
 
 def mro(

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/configs/processing/flattening.py

@@ -119,7 +119,7 @@ class ConfigFlattening:
     def unflatten(self, flattened: ta.Mapping[str, ta.Any]) -> ta.Mapping[str, ta.Any]:
         root = ConfigFlattening.UnflattenDict()
 
-        def split_keys(fkey: str) -> ta.Iterable[ta.Union[str, int]]:
+        def split_keys(fkey: str) -> ta.Iterator[ta.Union[str, int]]:
             for part in fkey.split(self._delimiter):
                 if self._index_open in part:
                     check.state(part.endswith(self._index_close))

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/configs/processing/merging.py

@@ -3,6 +3,7 @@
 """
 TODO:
  - smarter merging than just dumb dict-squashing
+  - at least sequence merging
 """
 import typing as ta
 
@@ -19,13 +20,14 @@ def merge_configs(*ms: ConfigMap) -> ConfigMap:
                 e = o[k]
             except KeyError:
                 o[k] = v
+                continue
+
+            if isinstance(e, ta.Mapping) and isinstance(v, ta.Mapping):
+                rec(e, v)  # noqa
             else:
-                if isinstance(e, ta.Mapping) and isinstance(v, ta.Mapping):
-                    rec(e, v)  # noqa
-                else:
-                    if isinstance(v, ta.Mapping):
-                        v = dict(v)
-                    o[k] = v
+                if isinstance(v, ta.Mapping):
+                    v = dict(v)
+                o[k] = v
 
     o: dict = {}
     for i in ms:

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/dataclasses/impl/concerns/doc.py

@@ -36,7 +36,7 @@ def _build_cls_doc(cls: type) -> str:
 
 
 class _LazyClsDocDescriptor:
-    def __get__(self, instance, owner):
+    def __get__(self, instance, owner=None):
         if instance is not None:
             owner = instance.__class__
         if not owner:

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/diag/_pycharm/runhack.py

@@ -51,7 +51,7 @@ class _cached_nullary:  # noqa
 
         return self._value
 
-    def __get__(self, instance, owner):  # noqa
+    def __get__(self, instance, owner=None):  # noqa
         bound = instance.__dict__[self._fn.__name__] = self.__class__(self._fn.__get__(instance, owner))
         return bound
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/diag/procfs.py

@@ -235,7 +235,7 @@ PAGEMAP_KEYS = (
 )
 
 
-def get_process_range_pagemaps(start: int, end: int, pid: PidLike = 'self') -> ta.Iterable[dict[str, int]]:
+def get_process_range_pagemaps(start: int, end: int, pid: PidLike = 'self') -> ta.Iterator[dict[str, int]]:
     """https://www.kernel.org/doc/Documentation/vm/pagemap.txt"""
 
     _check_linux()
@@ -262,7 +262,7 @@ def get_process_range_pagemaps(start: int, end: int, pid: PidLike = 'self') -> t
         }
 
 
-def get_process_pagemaps(pid: PidLike = 'self') -> ta.Iterable[dict[str, int]]:
+def get_process_pagemaps(pid: PidLike = 'self') -> ta.Iterator[dict[str, int]]:
     _check_linux()
     for m in get_process_maps(pid):
         yield from get_process_range_pagemaps(m['address'], m['end_address'], pid)

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/formats/json/stream/lexing.py

@@ -42,10 +42,13 @@ ControlTokenKind: ta.TypeAlias = ta.Literal[
 
 SpaceTokenKind: ta.TypeAlias = ta.Literal['SPACE']
 
+CommentTokenKind: ta.TypeAlias = ta.Literal['COMMENT']
+
 TokenKind: ta.TypeAlias = ta.Union[  # noqa
     ValueTokenKind,
     ControlTokenKind,
     SpaceTokenKind,
+    CommentTokenKind,
 ]
 
 
@@ -118,10 +121,12 @@ class JsonStreamLexer(GenMachine[str, Token]):
             include_raw: bool = False,
             include_space: bool = False,
             allow_comments: bool = False,
+            include_comments: bool = False,
     ) -> None:
         self._include_raw = include_raw
         self._include_space = include_space
         self._allow_comments = allow_comments
+        self._include_comments = include_comments
 
         self._ofs = 0
         self._line = 1
@@ -157,7 +162,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
             self,
             kind: TokenKind,
             value: ScalarValue,
-            raw: str,
+            raw: str | None,
             pos: Position,
     ) -> ta.Sequence[Token]:
         tok = Token(
@@ -177,9 +182,13 @@ class JsonStreamLexer(GenMachine[str, Token]):
     def _raise(self, msg: str, src: Exception | None = None) -> ta.NoReturn:
         raise JsonStreamLexError(msg, self.pos) from src
 
-    def _do_main(self):
+    def _do_main(self, peek: str | None = None):
         while True:
-            c = self._char_in((yield None))  # noqa
+            if peek is not None:
+                c = peek
+                peek = None
+            else:
+                c = self._char_in((yield None))  # noqa
 
             if not c:
                 return None
@@ -203,7 +212,8 @@ class JsonStreamLexer(GenMachine[str, Token]):
                 return self._do_const(c)
 
             if self._allow_comments and c == '/':
-                return self._do_comment()
+                yield from self._do_comment()
+                continue
 
             self._raise(f'Unexpected character: {c}')
 
@@ -295,17 +305,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
         if not c:
             return None
 
-        if c in CONTROL_TOKENS:
-            yield self._make_tok(CONTROL_TOKENS[c], c, c, pos)
-
-        elif c.isspace():
-            if self._include_space:
-                yield self._make_tok('SPACE', c, c, self.pos)
-
-        else:
-            self._raise(f'Unexpected character after number: {c}')
-
-        return self._do_main()
+        return self._do_main(c)
 
     def _do_const(self, c: str):
         pos = self.pos
@@ -328,4 +328,51 @@ class JsonStreamLexer(GenMachine[str, Token]):
         return self._do_main()
 
     def _do_comment(self):
-        raise NotImplementedError
+        check.state(self._buf.tell() == 0)
+
+        pos = self.pos
+        try:
+            oc = self._char_in((yield None))  # noqa
+        except GeneratorExit:
+            self._raise('Unexpected end of input')
+
+        if oc == '/':
+            while True:
+                try:
+                    ic = self._char_in((yield None))  # noqa
+                except GeneratorExit:
+                    self._raise('Unexpected end of input')
+
+                if ic == '\n':
+                    break
+
+                if self._include_comments:
+                    self._buf.write(ic)
+
+            if self._include_comments:
+                cmt = self._flip_buf()
+                raw = f'//{cmt}\n' if self._include_raw else None
+                yield self._make_tok('COMMENT', cmt, raw, pos)
+
+        elif oc == '*':
+            lc: str | None = None
+            while True:
+                try:
+                    ic = self._char_in((yield None))  # noqa
+                except GeneratorExit:
+                    self._raise('Unexpected end of input')
+
+                if lc == '*' and ic == '/':
+                    break
+
+                if lc is not None and self._include_comments:
+                    self._buf.write(lc)
+                lc = ic
+
+            if self._include_comments:
+                cmt = self._flip_buf()
+                raw = f'/*{cmt}*/' if self._include_raw else None
+                yield self._make_tok('COMMENT', cmt, raw, pos)
+
+        else:
+            self._raise(f'Unexpected character after comment start: {oc}')

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/formats/json/stream/parsing.py

@@ -106,7 +106,7 @@ class JsonStreamParser(GenMachine[Token, JsonStreamParserEvent]):
         while True:
             tok = yield None
 
-            if tok.kind != 'SPACE':
+            if tok.kind != 'SPACE' and tok.kind != 'COMMENT':
                 return tok
 
     #

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/formats/json/stream/utils.py

@@ -15,7 +15,7 @@ class JsonStreamValueParser(lang.ExitStacked):
     include_raw: bool = False
     yield_object_lists: bool = False
 
-    json5: bool = False
+    allow_comments: bool = False
 
     #
 
@@ -26,7 +26,7 @@ class JsonStreamValueParser(lang.ExitStacked):
     def _enter_contexts(self) -> None:
         self._lex = JsonStreamLexer(
             include_raw=self.include_raw,
-            allow_comments=self.json5,
+            allow_comments=self.allow_comments,
         )
 
         self._parse = JsonStreamParser()

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/formats/logfmt.py

@@ -20,7 +20,10 @@ def logfmt_encode(
 ) -> str:
     def encode(s: str) -> str:
         if _LOGFMT_ENCODE_WS_PAT.search(s) is not None:
-            return '"' + s.replace('\\', '\\\\').replace('"', '\\"') + '"'
+            s = s.replace('\\', '\\\\')
+            s = s.replace('\n', '\\n')
+            s = s.replace('"', '\\"')
+            return f'"{s}"'
         else:
             return s
 
@@ -67,7 +70,10 @@ def logfmt_decode(
         if s.startswith('"'):
             if len(s) < 2 or not s.endswith('"'):
                 raise ValueError(s)
-            s = s[1:-1].replace('\\"', '"').replace('\\\\', '\\')
+            s = s[1:-1]
+            s = s.replace('\\"', '"')
+            s = s.replace('\\n', '\n')
+            s = s.replace('\\\\', '\\')
         return s
 
     if value_decoder is None:

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/funcs/genmachine.py

@@ -88,7 +88,7 @@ class GenMachine(ta.Generic[I, O]):
 
     #
 
-    def __call__(self, i: I) -> ta.Iterable[O]:
+    def __call__(self, i: I) -> ta.Iterator[O]:
         if self._gen is None:
             raise GenMachine.ClosedError
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/http/sse.py

@@ -82,7 +82,7 @@ class SseDecoder:
 
         return e
 
-    def process_line(self, line: bytes) -> ta.Iterable[SseDecoderOutput]:
+    def process_line(self, line: bytes) -> ta.Iterator[SseDecoderOutput]:
         if b'\r' in line or b'\n' in line:
             raise ValueError(line)
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/inject/impl/injector.py

@@ -202,7 +202,7 @@ class InjectorImpl(Injector, lang.Final):
     #
 
     def try_provide(self, key: ta.Any) -> lang.Maybe[ta.Any]:
-        return self.try_provide(key)
+        return self._try_provide(key)
 
     def provide(self, key: ta.Any) -> ta.Any:
         v = self._try_provide(key)

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/inject/impl/multis.py

@@ -22,7 +22,7 @@ class SetProviderImpl(ProviderImpl, lang.Final):
     ps: ta.Sequence[ProviderImpl]
 
     @property
-    def providers(self) -> ta.Iterable[Provider]:
+    def providers(self) -> ta.Iterator[Provider]:
         for p in self.ps:
             yield from p.providers
 
@@ -43,7 +43,7 @@ class MapProviderImpl(ProviderImpl, lang.Final):
     es: ta.Sequence[Entry]
 
     @property
-    def providers(self) -> ta.Iterable[Provider]:
+    def providers(self) -> ta.Iterator[Provider]:
         for e in self.es:
             yield from e.v.providers
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/inject/impl/providers.py

@@ -7,7 +7,6 @@ import typing as ta
 
 from ... import dataclasses as dc
 from ... import lang
-from ... import reflect as rfl
 from ..injector import Injector
 from ..inspect import KwargsTarget
 from ..providers import ConstProvider
@@ -39,9 +38,6 @@ class ProviderImpl(lang.Abstract):
 class InternalProvider(Provider):
     impl: ProviderImpl
 
-    def provided_ty(self) -> rfl.Type | None:
-        raise TypeError
-
 
 ##
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/inject/impl/proxy.py

@@ -12,7 +12,6 @@ def _cyclic_dependency_proxy() -> tuple[type, ta.Callable[[ta.Any, ta.Any], None
     import wrapt  # noqa
 
     class _CyclicDependencyPlaceholder(lang.Final):
-
         def __init__(self, cls: ta.Any) -> None:
             super().__init__()
 
@@ -22,7 +21,6 @@ def _cyclic_dependency_proxy() -> tuple[type, ta.Callable[[ta.Any, ta.Any], None
             return f'{type(self).__name__}({self.__cls!r})'
 
     class _CyclicDependencyProxy(wrapt.ObjectProxy, lang.Final):  # noqa
-
         def __init__(self, cls):
             super().__init__(_CyclicDependencyPlaceholder(cls))
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/inject/scopes.py

@@ -5,7 +5,6 @@ import typing as ta
 from .. import check
 from .. import dataclasses as dc
 from .. import lang
-from .. import reflect as rfl
 from .bindings import Binding
 from .elements import Element
 from .keys import Key
@@ -76,9 +75,6 @@ class ScopeSeededProvider(Provider):
     ss: SeededScope = dc.xfield(coerce=check.of_isinstance(SeededScope))
     key: Key = dc.xfield(coerce=check.of_isinstance(Key))
 
-    def provided_ty(self) -> rfl.Type | None:
-        return self.key.ty
-
 
 def bind_scope_seed(k: ta.Any, ss: SeededScope) -> Element:
     k = as_key(k)

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/io/buffers.py

@@ -3,8 +3,8 @@
 import io
 import typing as ta
 
+from ..lite.attrops import attr_repr
 from ..lite.check import check
-from ..lite.strings import attr_repr
 
 
 ##

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/lang/__init__.py

@@ -17,17 +17,21 @@ with _auto_proxy_init(
         sync_async_list,
     )
 
-    from .attrs import (  # noqa
-        AttrOps,
+    from .attrstorage import (  # noqa
         AttributePresentError,
-        DictAttrOps,
-        STD_ATTR_OPS,
         SetAttrIfPresent,
-        StdAttrOps,
-        TRANSIENT_ATTR_OPS,
-        TransientAttrOps,
-        TransientDict,
         set_attr,
+
+        AttrStorage,
+
+        StdAttrStorage,
+        STD_ATTR_STORAGE,
+
+        DictAttrStorage,
+
+        TransientDict,
+        TransientAttrStorage,
+        TRANSIENT_ATTR_STORAGE,
         transient_delattr,
         transient_getattr,
         transient_setattr,
@@ -445,6 +449,17 @@ with _auto_proxy_init(
         Args,
     )
 
+    from ..lite.asyncs import (  # noqa
+        opt_await,
+    )
+
+    from ..lite.attrops import (  # noqa
+        AttrOps,
+        attr_ops,
+
+        attr_repr,
+    )
+
     from ..lite.contextmanagers import (  # noqa
         AsyncExitStacked,
         ExitStacked,
@@ -489,11 +504,6 @@ with _auto_proxy_init(
         dir_dict,
     )
 
-    from ..lite.reprs import (  # noqa
-        AttrRepr,
-        attr_repr,
-    )
-
     from ..lite.timeouts import (  # noqa
         DeadlineTimeout,
         InfiniteTimeout,

omlish-0.0.0.dev425/omlish/lang/attrs.py → omlish-0.0.0.dev426/omlish/lang/attrstorage.py

@@ -76,7 +76,7 @@ def set_attr(
 ##
 
 
-class AttrOps(Abstract):
+class AttrStorage(Abstract):
     class NOT_SET:  # noqa
         def __new__(cls, *args, **kwargs):  # noqa
             raise TypeError
@@ -97,9 +97,9 @@ class AttrOps(Abstract):
 #
 
 
-class StdAttrOps(AttrOps):
-    def getattr(self, obj: ta.Any, name: str, default: ta.Any = AttrOps.NOT_SET) -> ta.Any:
-        if default is AttrOps.NOT_SET:
+class StdAttrStorage(AttrStorage):
+    def getattr(self, obj: ta.Any, name: str, default: ta.Any = AttrStorage.NOT_SET) -> ta.Any:
+        if default is AttrStorage.NOT_SET:
             return getattr(obj, name)
         else:
             return getattr(obj, name, default)
@@ -111,13 +111,13 @@ class StdAttrOps(AttrOps):
         delattr(obj, name)
 
 
-STD_ATTR_OPS = StdAttrOps()
+STD_ATTR_STORAGE = StdAttrStorage()
 
 
 #
 
 
-class DictAttrOps(AttrOps):
+class DictAttrStorage(AttrStorage):
     def __init__(self, dct: ta.MutableMapping[str, ta.Any] | None = None) -> None:
         super().__init__()
 
@@ -125,11 +125,11 @@ class DictAttrOps(AttrOps):
             dct = {}
         self._dct = dct
 
-    def getattr(self, obj: ta.Any, name: str, default: ta.Any = AttrOps.NOT_SET) -> ta.Any:
+    def getattr(self, obj: ta.Any, name: str, default: ta.Any = AttrStorage.NOT_SET) -> ta.Any:
         try:
             return self._dct[name]
         except KeyError:
-            if default is not AttrOps.NOT_SET:
+            if default is not AttrStorage.NOT_SET:
                 return default
             raise AttributeError(name) from None
 
@@ -205,13 +205,13 @@ def _get_object_transient_dict(obj: ta.Any) -> TransientDict:
         return obj.__dict__.setdefault(_TRANSIENT_DICT_ATTR, TransientDict())
 
 
-class TransientAttrOps(AttrOps):
-    def getattr(self, obj: ta.Any, name: str, default: ta.Any = AttrOps.NOT_SET) -> ta.Any:
+class TransientAttrStorage(AttrStorage):
+    def getattr(self, obj: ta.Any, name: str, default: ta.Any = AttrStorage.NOT_SET) -> ta.Any:
         td = _get_object_transient_dict(obj)
         try:
             return td[name]
         except KeyError:
-            if default is not AttrOps.NOT_SET:
+            if default is not AttrStorage.NOT_SET:
                 return default
             raise AttributeError(name) from None
 
@@ -227,8 +227,8 @@ class TransientAttrOps(AttrOps):
             raise AttributeError(name) from None
 
 
-TRANSIENT_ATTR_OPS = TransientAttrOps()
+TRANSIENT_ATTR_STORAGE = TransientAttrStorage()
 
-transient_getattr = TRANSIENT_ATTR_OPS.getattr
-transient_setattr = TRANSIENT_ATTR_OPS.setattr
-transient_delattr = TRANSIENT_ATTR_OPS.delattr
+transient_getattr = TRANSIENT_ATTR_STORAGE.getattr
+transient_setattr = TRANSIENT_ATTR_STORAGE.setattr
+transient_delattr = TRANSIENT_ATTR_STORAGE.delattr

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/lang/cached/property.py

@@ -2,8 +2,8 @@ import abc
 import functools
 import typing as ta
 
-from ..attrs import transient_getattr
-from ..attrs import transient_setattr
+from ..attrstorage import transient_getattr
+from ..attrstorage import transient_setattr
 from ..classes.abstract import Abstract
 
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/lang/classes/simple.py

@@ -63,7 +63,6 @@ class Marker(NotInstantiable, metaclass=_MarkerMeta):
 
 
 _SINGLETON_INSTANCE_ATTR = '__singleton_instance__'
-_SINGLETON_LOCK = threading.RLock()
 
 
 def _set_singleton_instance(inst):
@@ -85,7 +84,24 @@ def _set_singleton_instance(inst):
     return inst
 
 
-class Singleton:
+class _AnySingleton:
+    def __init__(self) -> None:
+        try:
+            type(self).__dict__[_SINGLETON_INSTANCE_ATTR]
+        except KeyError:
+            pass
+        else:
+            raise TypeError(f'Must not re-instantiate singleton {type(self)}')
+
+        super().__init__()
+
+    @ta.final
+    def __reduce__(self):
+        return (type(self), ())
+
+
+class Singleton(_AnySingleton):
+    @ta.final
     def __new__(cls):
         return cls.__dict__[_SINGLETON_INSTANCE_ATTR]
 
@@ -95,15 +111,21 @@ class Singleton:
         _set_singleton_instance(super().__new__(cls))  # noqa
 
 
-class LazySingleton:
+_LAZY_SINGLETON_LOCK = threading.RLock()
+
+
+class LazySingleton(_AnySingleton):
+    @ta.final
     def __new__(cls):
         try:
             return cls.__dict__[_SINGLETON_INSTANCE_ATTR]
         except KeyError:
             pass
-        with _SINGLETON_LOCK:
+
+        with _LAZY_SINGLETON_LOCK:
             try:
                 return cls.__dict__[_SINGLETON_INSTANCE_ATTR]
             except KeyError:
                 pass
+
             return _set_singleton_instance(super().__new__(cls))

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/lang/collections.py

@@ -9,7 +9,7 @@ V = ta.TypeVar('V')
 ##
 
 
-def yield_dict_init(*args: ta.Any, **kwargs: ta.Any) -> ta.Iterable[tuple[ta.Any, ta.Any]]:
+def yield_dict_init(*args: ta.Any, **kwargs: ta.Any) -> ta.Iterator[tuple[ta.Any, ta.Any]]:
     if len(args) > 1:
         raise TypeError
 

{omlish-0.0.0.dev425 → omlish-0.0.0.dev426}/omlish/lang/iterables.py

@@ -46,14 +46,14 @@ def chunk(n: int, iterable: ta.Iterable[T], strict: bool = False) -> ta.Iterator
         return iterator
 
 
-def interleave(vs: ta.Iterable[T], d: T) -> ta.Iterable[T]:
+def interleave(vs: ta.Iterable[T], d: T) -> ta.Iterator[T]:
     for i, v in enumerate(vs):
         if i:
             yield d
         yield v
 
 
-def renumerate(it: ta.Iterable[T]) -> ta.Iterable[tuple[T, int]]:
+def renumerate(it: ta.Iterable[T]) -> ta.Iterator[tuple[T, int]]:
     return ((e, i) for i, e in enumerate(it))