omdev 0.0.6__tar.gz → 0.0.8__tar.gz

{omdev-0.0.6/omdev.egg-info → omdev-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.6
+Version: 0.0.8
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.6
+Requires-Dist: omlish==0.0.8
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.6 → omdev-0.0.8}/omdev/dataclasses/_dumping.py

@@ -38,7 +38,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../omlish/lite/check.py', sha1='c1249b29477b4bce088bc15d1a8521b9653e0593'),
+            dict(path='../../omlish/lite/check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -310,8 +310,6 @@ class Checks:
             exception_type = message
 
         else:
-            message = default_message
-
             if callable(message):
                 message = ta.cast(ta.Callable, message)(*ak.args, **ak.kwargs)
                 if isinstance(message, tuple):

{omdev-0.0.6 → omdev-0.0.8}/omdev/manifests/_dumping.py

@@ -39,7 +39,7 @@ def __omlish_amalg__():  # noqa
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='c1249b29477b4bce088bc15d1a8521b9653e0593'),
+            dict(path='../../omlish/lite/check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -426,8 +426,6 @@ class Checks:
             exception_type = message
 
         else:
-            message = default_message
-
             if callable(message):
                 message = ta.cast(ta.Callable, message)(*ak.args, **ak.kwargs)
                 if isinstance(message, tuple):

{omdev-0.0.6 → omdev-0.0.8}/omdev/packaging/marshal.py

@@ -9,6 +9,7 @@ from omlish import lang
 from omlish import marshal as msh
 from omlish import reflect as rfl
 
+from .requires import ParsedRequirement
 from .requires import RequiresMarkerItem
 from .requires import RequiresMarkerList
 from .requires import RequiresNode
@@ -79,3 +80,15 @@ def _install_standard_marshaling() -> None:
         msh.ReflectOverride(MarshalRequiresMarkerList),
         identity=True,
     )
+
+    msh.global_config_registry().register(
+        ParsedRequirement,
+        msh.ObjectOptions(
+            fields=dict(
+                marker=msh.FieldOptions(
+                    marshal_as=RequiresMarkerList | None,
+                    unmarshal_as=RequiresMarkerList | None,
+                ),
+            ),
+        ),
+    )

{omdev-0.0.6 → omdev-0.0.8}/omdev/packaging/requires.py

@@ -29,6 +29,7 @@ import re
 import typing as ta
 
 from omlish.lite.check import check
+from omlish.lite.dataclasses import install_dataclass_cache_hash
 
 from .specifiers import Specifier
 
@@ -241,7 +242,9 @@ class RequiresMarkerItem(ta.NamedTuple):
     r: ta.Union[RequiresVariable, RequiresValue]
 
 
-class ParsedRequirement(ta.NamedTuple):
+@install_dataclass_cache_hash()
+@dc.dataclass(frozen=True)
+class ParsedRequirement:
     name: str
     url: str
     extras: ta.List[str]

{omdev-0.0.6 → omdev-0.0.8}/omdev/scripts/ci.py

@@ -106,9 +106,9 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='c1249b29477b4bce088bc15d1a8521b9653e0593'),
-            dict(path='../../omlish/lite/contextmanagers.py', sha1='993f5ed96d3410f739a20363f55670d5e5267fa3'),
-            dict(path='../../omlish/lite/dataclasses.py', sha1='8b144d1d9474d96cf2a35f4db5cb224c30f538d6'),
+            dict(path='../../omlish/lite/check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
+            dict(path='../../omlish/lite/contextmanagers.py', sha1='7f319f3fbc1251b6eb37b98084dc2ed0e602051f'),
+            dict(path='../../omlish/lite/dataclasses.py', sha1='42ff344c22262193795c54929bfb90d0a3507bab'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/namespaces.py', sha1='27b12b6592403c010fb8b2a0af7c24238490d3a1'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
@@ -154,7 +154,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../oci/tars.py', sha1='3ed00e97a494bd92c6a6149d22d51469bc0af384'),
             dict(path='../../omlish/asyncs/asyncio/sockets.py', sha1='8d24dae988a30bb73f167a9ab62d4fc9eef4ad06'),
             dict(path='../../omlish/asyncs/asyncio/timeouts.py', sha1='4d31b02b3c39b8f2fa7e94db36552fde6942e36a'),
-            dict(path='../../omlish/formats/yaml/goyaml/tokens.py', sha1='05183c2980204609c9787a24c55e5ed806886962'),
+            dict(path='../../omlish/formats/yaml/goyaml/tokens.py', sha1='e9744c171d982ea8b4a6ace5f937926d51d5ec30'),
             dict(path='../../omlish/http/pipelines/bodymodes.py', sha1='d419b4bce96abbea7ee739412ece462ccbc77aa8'),
             dict(path='../../omlish/http/pipelines/objects.py', sha1='3de6f87e2a56375cc8a539321b1205e2d1d3900e'),
             dict(path='../../omlish/http/simple/handlers.py', sha1='9e49c2ba5518616ce15bed6bac80ab4c88ed3b83'),
@@ -165,7 +165,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/io/streams/base.py', sha1='bdeaff419684dec34fd0dc59808a9686131992bc'),
             dict(path='../../omlish/io/streams/framing.py', sha1='dc2d7f638b042619fd3d95789c71532a29fd5fe4'),
             dict(path='../../omlish/io/streams/utils.py', sha1='9fad1972d9d71412d81c1643261edcfbe02e9b71'),
-            dict(path='../../omlish/lite/inject.py', sha1='69a10563cf05ced0f06dd910c6c5b5b08d21a75f'),
+            dict(path='../../omlish/lite/inject.py', sha1='8cfee01601e9b8d7a4689cb5ba38de8c2bdb4706'),
             dict(path='../../omlish/logs/contexts.py', sha1='2f5881193a0c19c89c399ab0e0b5072c4048a60c'),
             dict(path='../../omlish/logs/std/standard.py', sha1='472f1f0623d6bcd301612551432afa7e3a661a34'),
             dict(path='../../omlish/logs/utils.py', sha1='f19e8f456172673b7418f3413f4ccef00a4b251c'),
@@ -208,7 +208,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../dataserver/http.py', sha1='41a6e39c6d66807b6189e2d78d8cf2ff10e45bc3'),
             dict(path='../oci/dataserver.py', sha1='dd147b56282b054cef264556a0ff3b3d1719bcee'),
             dict(path='../../omlish/asyncs/asyncio/subprocesses.py', sha1='b6b5f9ae3fd0b9c83593bad2e04a08f726e5904d'),
-            dict(path='../../omlish/formats/yaml/goyaml/decoding.py', sha1='7b0282593ca9fec2d70964ddd3ec6214e29bd864'),
+            dict(path='../../omlish/formats/yaml/goyaml/decoding.py', sha1='5047d6c283348c2cd4265c955bb94651e971addd'),
             dict(path='../../omlish/http/pipelines/aggregators.py', sha1='e6a35442108553f39bf5d5d61b55fcdaa3f347b5'),
             dict(path='../../omlish/io/pipelines/bytes/decoders.py', sha1='e49b17ece8aa2e006a6d92158628e2dc671e21f1'),
             dict(path='../../omlish/logs/modules.py', sha1='dd7d5f8e63fe8829dfb49460f3929ab64b68ee14'),
@@ -1508,8 +1508,6 @@ class Checks:
             exception_type = message
 
         else:
-            message = default_message
-
             if callable(message):
                 message = ta.cast(ta.Callable, message)(*ak.args, **ak.kwargs)
                 if isinstance(message, tuple):
@@ -2016,7 +2014,7 @@ class ExitStacked:
                     pass
                 else:
                     if fn is not getattr(ExitStacked, a):
-                        raise TypeError(f'ExitStacked subclass {cls} must not not override {a} via {b}')
+                        raise TypeError(f'ExitStacked subclass {cls} must not override {a} via {b}')
 
     _exit_stack: ta.Optional[contextlib.ExitStack] = None
 
@@ -2085,7 +2083,7 @@ class AsyncExitStacked:
                     pass
                 else:
                     if fn is not getattr(AsyncExitStacked, a):
-                        raise TypeError(f'AsyncExitStacked subclass {cls} must not not override {a} via {b}')
+                        raise TypeError(f'AsyncExitStacked subclass {cls} must not override {a} via {b}')
 
     _exit_stack: ta.Optional[contextlib.AsyncExitStack] = None
 
@@ -2235,7 +2233,7 @@ def install_dataclass_cache_hash(
         cached_hash_attr: str = '__dataclass_hash__',
 ):
     def inner(cls):
-        if not isinstance(cls, type) and dc.is_dataclass(cls):
+        if not (isinstance(cls, type) and dc.is_dataclass(cls)):
             raise TypeError(cls)
 
         if (
@@ -2250,7 +2248,7 @@ def install_dataclass_cache_hash(
             try:
                 return object.__getattribute__(self, cached_hash_attr)
             except AttributeError:
-                object.__setattr__(self, cached_hash_attr, h := real_hash(self))  # type: ignore[call-arg]
+                object.__setattr__(self, cached_hash_attr, h := real_hash(self))
             return h
 
         _install_dataclass_fn(cls, cached_hash, '__hash__')
@@ -2309,7 +2307,7 @@ def install_dataclass_filtered_repr(
         fn: ta.Union[ta.Callable[[ta.Any, dc.Field, ta.Any], bool], ta.Literal['omit_none', 'omit_falsey']],
 ):
     def inner(cls):
-        if not isinstance(cls, type) and dc.is_dataclass(cls):
+        if not (isinstance(cls, type) and dc.is_dataclass(cls)):
             raise TypeError(cls)
 
         def filtered_repr(self) -> str:
@@ -2331,7 +2329,7 @@ def dataclass_terse_repr(obj: ta.Any) -> str:
 
 def install_dataclass_terse_repr():
     def inner(cls):
-        if not isinstance(cls, type) and dc.is_dataclass(cls):
+        if not (isinstance(cls, type) and dc.is_dataclass(cls)):
             raise TypeError(cls)
 
         def terse_repr(self) -> str:
@@ -12240,7 +12238,7 @@ def _yaml_is_need_quoted(value: str) -> bool:
     if value == '-':
         return True
 
-    if value[0] in ('*', '&', '[', '{', '}', ']', ',', '!', '|', '>', '%', '\'', '"', '@', ' ', '`'):
+    if value[0] in ('*', '&', '[', '{', '}', ']', ',', '!', '|', '>', '%', '\'', '"', '@', ' ', '`', ':'):
         return True
 
     if value[-1] in (':', ' '):
@@ -14546,8 +14544,8 @@ class _Injector(Injector):
 
             if self._p is not None:
                 pv = self._p.try_provide(key)
-                if pv is not None:
-                    return cr.handle_provision(key, Maybe.empty())
+                if pv.present:
+                    return cr.handle_provision(key, pv)
 
             return cr.handle_provision(key, Maybe.empty())
 
@@ -28459,6 +28457,9 @@ class YamlDecoder:
                 self.anchor_node_map[anchor_name] = n.value
                 return self.get_map_node(check.not_none(n.value), is_merge)
 
+            elif isinstance(n, TagYamlNode):
+                return self.get_map_node(check.not_none(n.value), is_merge)
+
             elif isinstance(n, AliasYamlNode):
                 alias_name = check.not_none(check.not_none(n.value).get_token()).value
                 node2 = self.anchor_node_map[alias_name]
@@ -28492,19 +28493,17 @@ class YamlDecoder:
                 return None
 
             if isinstance(anchor := node, AnchorYamlNode):
-                if isinstance(array_node := anchor.value, ArrayYamlNode):
-                    return array_node
-
-                return UnexpectedNodeTypeYamlError(check.not_none(anchor.value).type(), YamlNodeType.SEQUENCE, check.not_none(node.get_token()))  # noqa
+                return self.get_array_node(check.not_none(anchor.value))
 
             if isinstance(alias := node, AliasYamlNode):
                 alias_name = check.not_none(check.not_none(alias.value).get_token()).value
                 node2 = self.anchor_node_map[alias_name]
                 if node2 is None:
                     return yaml_error(f'cannot find anchor by alias name {alias_name}')
-                if isinstance(array_node := node2, ArrayYamlNode):
-                    return array_node
-                return UnexpectedNodeTypeYamlError(node2.type(), YamlNodeType.SEQUENCE, check.not_none(node2.get_token()))  # noqa
+                return self.get_array_node(node2)
+
+            if isinstance(tag := node, TagYamlNode):
+                return self.get_array_node(check.not_none(tag.value))
 
             if not isinstance(array_node := node, ArrayYamlNode):
                 return UnexpectedNodeTypeYamlError(node.type(), YamlNodeType.SEQUENCE, check.not_none(node.get_token()))  # noqa

{omdev-0.0.6 → omdev-0.0.8}/omdev/scripts/interp.py

@@ -56,7 +56,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../packaging/versions.py', sha1='d515a54dd7fa27a9fd4d8c8617e5a21a3c12ea1e'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='c1249b29477b4bce088bc15d1a8521b9653e0593'),
+            dict(path='../../omlish/lite/check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -73,7 +73,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/logs/std/json.py', sha1='2a75553131e4d5331bb0cedde42aa183f403fc3b'),
             dict(path='types.py', sha1='c53a8d45d29f2010244760adeb8dcd02a4a240e1'),
             dict(path='../../omlish/asyncs/asyncio/timeouts.py', sha1='4d31b02b3c39b8f2fa7e94db36552fde6942e36a'),
-            dict(path='../../omlish/lite/inject.py', sha1='69a10563cf05ced0f06dd910c6c5b5b08d21a75f'),
+            dict(path='../../omlish/lite/inject.py', sha1='8cfee01601e9b8d7a4689cb5ba38de8c2bdb4706'),
             dict(path='../../omlish/logs/std/standard.py', sha1='472f1f0623d6bcd301612551432afa7e3a661a34'),
             dict(path='../../omlish/subprocesses/run.py', sha1='1d2a78b18bcc601c8b28269d792cc38bbf25a078'),
             dict(path='../../omlish/subprocesses/wrap.py', sha1='8a9b7d2255481fae15c05f5624b0cdc0766f4b3f'),
@@ -925,8 +925,6 @@ class Checks:
             exception_type = message
 
         else:
-            message = default_message
-
             if callable(message):
                 message = ta.cast(ta.Callable, message)(*ak.args, **ak.kwargs)
                 if isinstance(message, tuple):
@@ -4163,8 +4161,8 @@ class _Injector(Injector):
 
             if self._p is not None:
                 pv = self._p.try_provide(key)
-                if pv is not None:
-                    return cr.handle_provision(key, Maybe.empty())
+                if pv.present:
+                    return cr.handle_provision(key, pv)
 
             return cr.handle_provision(key, Maybe.empty())
 

{omdev-0.0.6 → omdev-0.0.8}/omdev/scripts/lib/formats/goyaml.py

@@ -35,14 +35,14 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../../lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../../lite/check.py', sha1='c1249b29477b4bce088bc15d1a8521b9653e0593'),
-            dict(path='../../../lite/dataclasses.py', sha1='8b144d1d9474d96cf2a35f4db5cb224c30f538d6'),
+            dict(path='../../../lite/check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
+            dict(path='../../../lite/dataclasses.py', sha1='42ff344c22262193795c54929bfb90d0a3507bab'),
             dict(path='errors.py', sha1='c4dda09d78bc14d9824e45e3d5d434185ee5598b'),
-            dict(path='tokens.py', sha1='05183c2980204609c9787a24c55e5ed806886962'),
+            dict(path='tokens.py', sha1='e9744c171d982ea8b4a6ace5f937926d51d5ec30'),
             dict(path='ast.py', sha1='6d21da91079afcd58467a58153951a6b97a97c20'),
             dict(path='scanning.py', sha1='9c7bb51121f85ac499f8f907fbc3ce20a07f3e1d'),
             dict(path='parsing.py', sha1='78c28c2b865c57077b071543361920db142242d0'),
-            dict(path='decoding.py', sha1='7b0282593ca9fec2d70964ddd3ec6214e29bd864'),
+            dict(path='decoding.py', sha1='5047d6c283348c2cd4265c955bb94651e971addd'),
             dict(path='_amalg.py', sha1='85989224f581528c4a189dca142cb3ec086ecd3c'),
         ],
     )
@@ -312,8 +312,6 @@ class Checks:
             exception_type = message
 
         else:
-            message = default_message
-
             if callable(message):
                 message = ta.cast(ta.Callable, message)(*ak.args, **ak.kwargs)
                 if isinstance(message, tuple):
@@ -841,7 +839,7 @@ def install_dataclass_cache_hash(
         cached_hash_attr: str = '__dataclass_hash__',
 ):
     def inner(cls):
-        if not isinstance(cls, type) and dc.is_dataclass(cls):
+        if not (isinstance(cls, type) and dc.is_dataclass(cls)):
             raise TypeError(cls)
 
         if (
@@ -856,7 +854,7 @@ def install_dataclass_cache_hash(
             try:
                 return object.__getattribute__(self, cached_hash_attr)
             except AttributeError:
-                object.__setattr__(self, cached_hash_attr, h := real_hash(self))  # type: ignore[call-arg]
+                object.__setattr__(self, cached_hash_attr, h := real_hash(self))
             return h
 
         _install_dataclass_fn(cls, cached_hash, '__hash__')
@@ -915,7 +913,7 @@ def install_dataclass_filtered_repr(
         fn: ta.Union[ta.Callable[[ta.Any, dc.Field, ta.Any], bool], ta.Literal['omit_none', 'omit_falsey']],
 ):
     def inner(cls):
-        if not isinstance(cls, type) and dc.is_dataclass(cls):
+        if not (isinstance(cls, type) and dc.is_dataclass(cls)):
             raise TypeError(cls)
 
         def filtered_repr(self) -> str:
@@ -937,7 +935,7 @@ def dataclass_terse_repr(obj: ta.Any) -> str:
 
 def install_dataclass_terse_repr():
     def inner(cls):
-        if not isinstance(cls, type) and dc.is_dataclass(cls):
+        if not (isinstance(cls, type) and dc.is_dataclass(cls)):
             raise TypeError(cls)
 
         def terse_repr(self) -> str:
@@ -1656,7 +1654,7 @@ def _yaml_is_need_quoted(value: str) -> bool:
     if value == '-':
         return True
 
-    if value[0] in ('*', '&', '[', '{', '}', ']', ',', '!', '|', '>', '%', '\'', '"', '@', ' ', '`'):
+    if value[0] in ('*', '&', '[', '{', '}', ']', ',', '!', '|', '>', '%', '\'', '"', '@', ' ', '`', ':'):
         return True
 
     if value[-1] in (':', ' '):
@@ -9365,6 +9363,9 @@ class YamlDecoder:
                 self.anchor_node_map[anchor_name] = n.value
                 return self.get_map_node(check.not_none(n.value), is_merge)
 
+            elif isinstance(n, TagYamlNode):
+                return self.get_map_node(check.not_none(n.value), is_merge)
+
             elif isinstance(n, AliasYamlNode):
                 alias_name = check.not_none(check.not_none(n.value).get_token()).value
                 node2 = self.anchor_node_map[alias_name]
@@ -9398,19 +9399,17 @@ class YamlDecoder:
                 return None
 
             if isinstance(anchor := node, AnchorYamlNode):
-                if isinstance(array_node := anchor.value, ArrayYamlNode):
-                    return array_node
-
-                return UnexpectedNodeTypeYamlError(check.not_none(anchor.value).type(), YamlNodeType.SEQUENCE, check.not_none(node.get_token()))  # noqa
+                return self.get_array_node(check.not_none(anchor.value))
 
             if isinstance(alias := node, AliasYamlNode):
                 alias_name = check.not_none(check.not_none(alias.value).get_token()).value
                 node2 = self.anchor_node_map[alias_name]
                 if node2 is None:
                     return yaml_error(f'cannot find anchor by alias name {alias_name}')
-                if isinstance(array_node := node2, ArrayYamlNode):
-                    return array_node
-                return UnexpectedNodeTypeYamlError(node2.type(), YamlNodeType.SEQUENCE, check.not_none(node2.get_token()))  # noqa
+                return self.get_array_node(node2)
+
+            if isinstance(tag := node, TagYamlNode):
+                return self.get_array_node(check.not_none(tag.value))
 
             if not isinstance(array_node := node, ArrayYamlNode):
                 return UnexpectedNodeTypeYamlError(node.type(), YamlNodeType.SEQUENCE, check.not_none(node.get_token()))  # noqa

{omdev-0.0.6 → omdev-0.0.8}/omdev/scripts/lib/inject.py

@@ -32,10 +32,10 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='check.py', sha1='c1249b29477b4bce088bc15d1a8521b9653e0593'),
+            dict(path='check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='maybes.py', sha1='5ac5f92e5610c6795b0a228c38e7bcd272bf6305'),
-            dict(path='inject.py', sha1='69a10563cf05ced0f06dd910c6c5b5b08d21a75f'),
+            dict(path='inject.py', sha1='8cfee01601e9b8d7a4689cb5ba38de8c2bdb4706'),
         ],
     )
 
@@ -310,8 +310,6 @@ class Checks:
             exception_type = message
 
         else:
-            message = default_message
-
             if callable(message):
                 message = ta.cast(ta.Callable, message)(*ak.args, **ak.kwargs)
                 if isinstance(message, tuple):
@@ -1808,8 +1806,8 @@ class _Injector(Injector):
 
             if self._p is not None:
                 pv = self._p.try_provide(key)
-                if pv is not None:
-                    return cr.handle_provision(key, Maybe.empty())
+                if pv.present:
+                    return cr.handle_provision(key, pv)
 
             return cr.handle_provision(key, Maybe.empty())
 

{omdev-0.0.6 → omdev-0.0.8}/omdev/scripts/lib/io/pipelines.py

@@ -40,7 +40,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../types.py', sha1='16da767fb3119e0886e821a1ef5f1c79ac4111e6'),
             dict(path='../../lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
-            dict(path='../../lite/check.py', sha1='c1249b29477b4bce088bc15d1a8521b9653e0593'),
+            dict(path='../../lite/check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
             dict(path='../../lite/namespaces.py', sha1='27b12b6592403c010fb8b2a0af7c24238490d3a1'),
             dict(path='../../logs/levels.py', sha1='83f6cdd019675b52181422442e7d7541597d0df2'),
             dict(path='../../logs/warnings.py', sha1='c4eb694b24773351107fcc058f3620f1dbfb6799'),
@@ -715,8 +715,6 @@ class Checks:
             exception_type = message
 
         else:
-            message = default_message
-
             if callable(message):
                 message = ta.cast(ta.Callable, message)(*ak.args, **ak.kwargs)
                 if isinstance(message, tuple):

{omdev-0.0.6 → omdev-0.0.8}/omdev/scripts/lib/marshal.py

@@ -41,7 +41,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='check.py', sha1='c1249b29477b4bce088bc15d1a8521b9653e0593'),
+            dict(path='check.py', sha1='7088e41034dbdce7bdae200793aaa9d6838c79d8'),
             dict(path='objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -311,8 +311,6 @@ class Checks:
             exception_type = message
 
         else:
-            message = default_message
-
             if callable(message):
                 message = ta.cast(ta.Callable, message)(*ak.args, **ak.kwargs)
                 if isinstance(message, tuple):