omdev 0.0.0.dev142__py3-none-any.whl → 0.0.0.dev143__py3-none-any.whl

omdev/amalg/amalg.py

@@ -366,11 +366,22 @@ def make_src_file(
             ])
 
         elif is_root_level_if_type_checking_block(line):
-            while True:
-                nl = cls[i]
-                if nl and nl[0].name != 'INDENT':
-                    break
+            def skip_block():
+                nonlocal i
+                while True:
+                    nl = cls[i]
+                    if nl and nl[0].name != 'INDENT':
+                        return nl
+                    i += 1
+
+            nl = skip_block()
+
+            if tks.match_toks(nl, [
+                ('DEDENT', None),
+                ('NAME', 'else'),
+            ]):
                 i += 1
+                skip_block()
 
         else:
             ctls.append(line)

omdev/interp/pyenv.py

@@ -136,6 +136,7 @@ DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(
         '-k',
     ],
     conf_opts=[
+        # FIXME: breaks on mac for older py's
         '--enable-loadable-sqlite-extensions',
 
         # '--enable-shared',

omdev/scripts/interp.py

@@ -2061,6 +2061,7 @@ DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(
         '-k',
     ],
     conf_opts=[
+        # FIXME: breaks on mac for older py's
         '--enable-loadable-sqlite-extensions',
 
         # '--enable-shared',

omdev/scripts/pyproject.py

@@ -3084,21 +3084,26 @@ TODO:
 ##
 
 
+@dc.dataclass(frozen=True)
+class ObjMarshalOptions:
+    raw_bytes: bool = False
+
+
 class ObjMarshaler(abc.ABC):
     @abc.abstractmethod
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         raise NotImplementedError
 
 
 class NopObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o
 
 
@@ -3106,29 +3111,29 @@ class NopObjMarshaler(ObjMarshaler):
 class ProxyObjMarshaler(ObjMarshaler):
     m: ta.Optional[ObjMarshaler] = None
 
-    def marshal(self, o: ta.Any) -> ta.Any:
-        return check_not_none(self.m).marshal(o)
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return check_not_none(self.m).marshal(o, opts)
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
-        return check_not_none(self.m).unmarshal(o)
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return check_not_none(self.m).unmarshal(o, opts)
 
 
 @dc.dataclass(frozen=True)
 class CastObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return self.ty(o)
 
 
 class DynamicObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return marshal_obj(o)
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o
 
 
@@ -3136,21 +3141,36 @@ class DynamicObjMarshaler(ObjMarshaler):
 class Base64ObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return base64.b64encode(o).decode('ascii')
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return self.ty(base64.b64decode(o))
 
 
+@dc.dataclass(frozen=True)
+class BytesSwitchedObjMarshaler(ObjMarshaler):
+    m: ObjMarshaler
+
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        if opts.raw_bytes:
+            return o
+        return self.m.marshal(o, opts)
+
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        if opts.raw_bytes:
+            return o
+        return self.m.unmarshal(o, opts)
+
+
 @dc.dataclass(frozen=True)
 class EnumObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o.name
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return self.ty.__members__[o]  # type: ignore
 
 
@@ -3158,15 +3178,15 @@ class EnumObjMarshaler(ObjMarshaler):
 class OptionalObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         if o is None:
             return None
-        return self.item.marshal(o)
+        return self.item.marshal(o, opts)
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         if o is None:
             return None
-        return self.item.unmarshal(o)
+        return self.item.unmarshal(o, opts)
 
 
 @dc.dataclass(frozen=True)
@@ -3175,11 +3195,11 @@ class MappingObjMarshaler(ObjMarshaler):
     km: ObjMarshaler
     vm: ObjMarshaler
 
-    def marshal(self, o: ta.Any) -> ta.Any:
-        return {self.km.marshal(k): self.vm.marshal(v) for k, v in o.items()}
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return {self.km.marshal(k, opts): self.vm.marshal(v, opts) for k, v in o.items()}
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty((self.km.unmarshal(k), self.vm.unmarshal(v)) for k, v in o.items())
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return self.ty((self.km.unmarshal(k, opts), self.vm.unmarshal(v, opts)) for k, v in o.items())
 
 
 @dc.dataclass(frozen=True)
@@ -3187,11 +3207,11 @@ class IterableObjMarshaler(ObjMarshaler):
     ty: type
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any) -> ta.Any:
-        return [self.item.marshal(e) for e in o]
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return [self.item.marshal(e, opts) for e in o]
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty(self.item.unmarshal(e) for e in o)
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return self.ty(self.item.unmarshal(e, opts) for e in o)
 
 
 @dc.dataclass(frozen=True)
@@ -3200,11 +3220,11 @@ class DataclassObjMarshaler(ObjMarshaler):
     fs: ta.Mapping[str, ObjMarshaler]
     nonstrict: bool = False
 
-    def marshal(self, o: ta.Any) -> ta.Any:
-        return {k: m.marshal(getattr(o, k)) for k, m in self.fs.items()}
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return {k: m.marshal(getattr(o, k), opts) for k, m in self.fs.items()}
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items() if not self.nonstrict or k in self.fs})
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+        return self.ty(**{k: self.fs[k].unmarshal(v, opts) for k, v in o.items() if not self.nonstrict or k in self.fs})
 
 
 @dc.dataclass(frozen=True)
@@ -3224,50 +3244,50 @@ class PolymorphicObjMarshaler(ObjMarshaler):
             {i.tag: i for i in impls},
         )
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         impl = self.impls_by_ty[type(o)]
-        return {impl.tag: impl.m.marshal(o)}
+        return {impl.tag: impl.m.marshal(o, opts)}
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         [(t, v)] = o.items()
         impl = self.impls_by_tag[t]
-        return impl.m.unmarshal(v)
+        return impl.m.unmarshal(v, opts)
 
 
 @dc.dataclass(frozen=True)
 class DatetimeObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return o.isoformat()
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return self.ty.fromisoformat(o)  # type: ignore
 
 
 class DecimalObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return str(check_isinstance(o, decimal.Decimal))
 
-    def unmarshal(self, v: ta.Any) -> ta.Any:
+    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return decimal.Decimal(check_isinstance(v, str))
 
 
 class FractionObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         fr = check_isinstance(o, fractions.Fraction)
         return [fr.numerator, fr.denominator]
 
-    def unmarshal(self, v: ta.Any) -> ta.Any:
+    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         num, denom = check_isinstance(v, list)
         return fractions.Fraction(num, denom)
 
 
 class UuidObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any) -> ta.Any:
+    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return str(o)
 
-    def unmarshal(self, o: ta.Any) -> ta.Any:
+    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
         return uuid.UUID(o)
 
 
@@ -3277,7 +3297,7 @@ class UuidObjMarshaler(ObjMarshaler):
 _DEFAULT_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
     **{t: NopObjMarshaler() for t in (type(None),)},
     **{t: CastObjMarshaler(t) for t in (int, float, str, bool)},
-    **{t: Base64ObjMarshaler(t) for t in (bytes, bytearray)},
+    **{t: BytesSwitchedObjMarshaler(Base64ObjMarshaler(t)) for t in (bytes, bytearray)},
     **{t: IterableObjMarshaler(t, DynamicObjMarshaler()) for t in (list, tuple, set, frozenset)},
     **{t: MappingObjMarshaler(t, DynamicObjMarshaler(), DynamicObjMarshaler()) for t in (dict,)},
 
@@ -3310,12 +3330,16 @@ class ObjMarshalerManager:
     def __init__(
             self,
             *,
+            default_options: ObjMarshalOptions = ObjMarshalOptions(),
+
             default_obj_marshalers: ta.Dict[ta.Any, ObjMarshaler] = _DEFAULT_OBJ_MARSHALERS,  # noqa
             generic_mapping_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_MAPPING_TYPES,  # noqa
             generic_iterable_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES,  # noqa
     ) -> None:
         super().__init__()
 
+        self._default_options = default_options
+
         self._obj_marshalers = dict(default_obj_marshalers)
         self._generic_mapping_types = generic_mapping_types
         self._generic_iterable_types = generic_iterable_types
@@ -3424,11 +3448,35 @@ class ObjMarshalerManager:
 
     #
 
-    def marshal_obj(self, o: ta.Any, ty: ta.Any = None) -> ta.Any:
-        return self.get_obj_marshaler(ty if ty is not None else type(o)).marshal(o)
-
-    def unmarshal_obj(self, o: ta.Any, ty: ta.Union[ta.Type[T], ta.Any]) -> T:
-        return self.get_obj_marshaler(ty).unmarshal(o)
+    def marshal_obj(
+            self,
+            o: ta.Any,
+            ty: ta.Any = None,
+            opts: ta.Optional[ObjMarshalOptions] = None,
+    ) -> ta.Any:
+        m = self.get_obj_marshaler(ty if ty is not None else type(o))
+        return m.marshal(o, opts or self._default_options)
+
+    def unmarshal_obj(
+            self,
+            o: ta.Any,
+            ty: ta.Union[ta.Type[T], ta.Any],
+            opts: ta.Optional[ObjMarshalOptions] = None,
+    ) -> T:
+        m = self.get_obj_marshaler(ty)
+        return m.unmarshal(o, opts or self._default_options)
+
+    def roundtrip_obj(
+            self,
+            o: ta.Any,
+            ty: ta.Any = None,
+            opts: ta.Optional[ObjMarshalOptions] = None,
+    ) -> ta.Any:
+        if ty is None:
+            ty = type(o)
+        m: ta.Any = self.marshal_obj(o, ty, opts)
+        u: ta.Any = self.unmarshal_obj(m, ty, opts)
+        return u
 
 
 ##
@@ -4653,6 +4701,7 @@ DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(
         '-k',
     ],
     conf_opts=[
+        # FIXME: breaks on mac for older py's
         '--enable-loadable-sqlite-extensions',
 
         # '--enable-shared',

{omdev-0.0.0.dev142.dist-info → omdev-0.0.0.dev143.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev142
+Version: 0.0.0.dev143
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev142
+Requires-Dist: omlish==0.0.0.dev143
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev142.dist-info → omdev-0.0.0.dev143.dist-info}/RECORD

@@ -14,7 +14,7 @@ omdev/tokens.py,sha256=eCppK7BtlgAK_AmfO-Or_B-x85tqmu0HVla8d2gvB3I,1333
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=h94M-VqZ3AFBU2a8zOsjeKK7RF6uINhTHl6OiGbVMgw,163
-omdev/amalg/amalg.py,sha256=kGSnG6gUP0I2CCHZFxm6tlfMwI86NIGXazmEGrDXUBg,15799
+omdev/amalg/amalg.py,sha256=AEhgXmc9y3zfvMpAdJUuTwlhYZ5bCAUrVf1WHsgV5PI,16084
 omdev/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/antlr/consts.py,sha256=8pR6r0m0P3hAiyiAoJZ-nptd2GYbZ98mxwPL9cpaRuw,279
 omdev/antlr/gen.py,sha256=QnPyVWUrJYqHoOc3XsXA8fJdoiwAj6pyUwdG-DVrIeA,2953
@@ -74,7 +74,7 @@ omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
 omdev/interp/cli.py,sha256=sh7PZQoLletUViw1Y9OXNr9ekyNZ6YyxYuOQ_n9hyqU,2072
 omdev/interp/inspect.py,sha256=55_il4ehoW6Q468YE57w5CyZxHLNsndkRIH4W80OplM,2848
 omdev/interp/providers.py,sha256=PFEjozW0c33eqg8sno-GHMKbhVUzQF9jrAx-M0uQimk,1787
-omdev/interp/pyenv.py,sha256=0RJvW_kltDPANIHBgG0Ak02BXJfFMvr-4AWi6ATmTXo,13791
+omdev/interp/pyenv.py,sha256=rHps4saqLxp-udbZp-5RpFxNhZNQc6plqIvaCQpNBHo,13837
 omdev/interp/resolvers.py,sha256=tpzlmqGp1C4QKdA6TfcPmtmaygu7mb6WK2RPSbyNQ6s,3022
 omdev/interp/standalone.py,sha256=XcltiL7ypcfV89C82_3knQ3Kx7aW4wnnxf2056ZXC3A,7731
 omdev/interp/system.py,sha256=bI-JhX4GVJqW7wMxnIa-DGJWnCLmFcIsnl9pc1RGY2g,3513
@@ -122,8 +122,8 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=cJQYbRsx2Qf05itHg4iUNlGjcuqWeM-86RDbaZ6Mjco,74241
-omdev/scripts/pyproject.py,sha256=XJ3cXjavrTvpuhwHYKH5CBaiQG52R9i1Lm72G3rdGm8,176910
+omdev/scripts/interp.py,sha256=Xzki1bTvF2uahDrK65_A-lbN29W67jE4t7v8SY__F44,74287
+omdev/scripts/pyproject.py,sha256=rxjEsErhrVmoOhX8RYZ0i77D13VKaE7uGFveu--bGtk,179110
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -152,9 +152,9 @@ omdev/tools/json/rendering.py,sha256=jNShMfCpFR9-Kcn6cUFuOChXHjg71diuTC4x7Ofmz-o
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev142.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev142.dist-info/METADATA,sha256=vIeFYVEB7oIe35hTR-g4SVT5Qg30RiWFC0cj4BplvQk,1760
-omdev-0.0.0.dev142.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev142.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev142.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev142.dist-info/RECORD,,
+omdev-0.0.0.dev143.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev143.dist-info/METADATA,sha256=HJIwPryCdCZ5UD9KXomKAnnSDmjDIb3fiL2ytP2hEZU,1760
+omdev-0.0.0.dev143.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev143.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev143.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev143.dist-info/RECORD,,