omlish 0.0.0.dev120__tar.gz → 0.0.0.dev121__tar.gz

{omlish-0.0.0.dev120/omlish.egg-info → omlish-0.0.0.dev121}/PKG-INFO

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

{omlish-0.0.0.dev120 → omlish-0.0.0.dev121}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev120'
-__revision__ = 'aada6beb1d685cb095429e9c588d266b8a83aa23'
+__version__ = '0.0.0.dev121'
+__revision__ = '8d604587a14f8faa089e1a5d3ff68756b93b0c1f'
 
 
 #

{omlish-0.0.0.dev120 → omlish-0.0.0.dev121}/omlish/inject/binder.py

@@ -74,7 +74,7 @@ def bind_as_fn(cls: type[T]) -> type[T]:
 ##
 
 
-_BANNED_BIND_TYPES = (
+_BANNED_BIND_TYPES: tuple[type, ...] = (
     Element,
     Provider,
     Elements,

{omlish-0.0.0.dev120 → omlish-0.0.0.dev121}/omlish/inject/impl/inspect.py

@@ -7,7 +7,6 @@ TODO:
 """
 import dataclasses as dc
 import inspect
-import types
 import typing as ta
 import weakref
 
@@ -28,38 +27,38 @@ R = ta.TypeVar('R')
 ##
 
 
-_signature_cache: ta.MutableMapping[ta.Any, inspect.Signature] = weakref.WeakKeyDictionary()
+_SIGNATURE_CACHE: ta.MutableMapping[ta.Any, inspect.Signature] = weakref.WeakKeyDictionary()
 
 
 def signature(obj: ta.Any) -> inspect.Signature:
     try:
-        return _signature_cache[obj]
+        return _SIGNATURE_CACHE[obj]
     except TypeError:
         return inspect.signature(obj)
     except KeyError:
         pass
     sig = inspect.signature(obj)
-    _signature_cache[obj] = sig
+    _SIGNATURE_CACHE[obj] = sig
     return sig
 
 
 ##
 
 
-_tags: ta.MutableMapping[ta.Any, dict[str, ta.Any]] = weakref.WeakKeyDictionary()
+_TAGS: ta.MutableMapping[ta.Any, dict[str, ta.Any]] = weakref.WeakKeyDictionary()
 
 
 def tag(obj: T, **kwargs: ta.Any) -> T:
     for v in kwargs.values():
         if isinstance(v, Tag):
             raise TypeError(v)
-    _tags.setdefault(obj, {}).update(**kwargs)
+    _TAGS.setdefault(obj, {}).update(**kwargs)
     return obj
 
 
 def tags(**kwargs: ta.Any) -> ta.Callable[[ta.Callable[P, R]], ta.Callable[P, R]]:
     def inner(obj):
-        _tags[obj] = kwargs
+        _TAGS[obj] = kwargs
         return obj
     return inner
 
@@ -75,7 +74,7 @@ def build_kwargs_target(
         raw_optional: bool = False,
 ) -> KwargsTarget:
     sig = signature(obj)
-    tags = _tags.get(obj)
+    tags = _TAGS.get(obj)
 
     seen: set[Key] = set(map(as_key, skip_kwargs)) if skip_kwargs is not None else set()
     kws: list[Kwarg] = []
@@ -92,10 +91,9 @@ def build_kwargs_target(
         if (
                 not raw_optional and
                 isinstance(rf := rfl.type_(ann), rfl.Union) and
-                len(rf.args) == 2   # noqa
-                and types.NoneType in rf.args
+                rf.is_optional
         ):
-            [ann] = [a for a in rf.args if a is not types.NoneType]
+            ann = rf.without_none()
 
         rty = rfl.type_(ann)
 

{omlish-0.0.0.dev120 → omlish-0.0.0.dev121}/omlish/lite/cached.py

@@ -22,5 +22,5 @@ class _cached_nullary:  # noqa
         return bound
 
 
-def cached_nullary(fn: ta.Callable[..., T]) -> ta.Callable[..., T]:
+def cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
     return _cached_nullary(fn)

{omlish-0.0.0.dev120 → omlish-0.0.0.dev121}/omlish/lite/contextmanagers.py

@@ -25,8 +25,12 @@ class ExitStacked:
     def __exit__(self, exc_type, exc_val, exc_tb):
         if (es := self._exit_stack) is None:
             return None
+        self._exit_contexts()
         return es.__exit__(exc_type, exc_val, exc_tb)
 
+    def _exit_contexts(self) -> None:
+        pass
+
     def _enter_context(self, cm: ta.ContextManager[T]) -> T:
         es = check_not_none(self._exit_stack)
         return es.enter_context(cm)