omlish 0.0.0.dev328__py3-none-any.whl → 0.0.0.dev329__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev328'
-__revision__ = '80b9ed17dd2aefd7dd86d4aa2f14fac4281cf8d6'
+__version__ = '0.0.0.dev329'
+__revision__ = '7e2175a0f120aff13b483ddfb737fe5676cd9721'
 
 
 #

omlish/reflect/subst.py

@@ -43,13 +43,14 @@ def replace_type_vars(
             args = tuple(rec(a) for a in cur.args)
             if update_aliases:
                 obj = cur.obj
-                if (ops := get_params(obj)):
-                    nargs = [to_annotation(rpl[p]) for p in ops]
-                    if ta.get_origin(obj) is ta.Generic:
-                        # FIXME: None? filter_typing_generic in get_generic_bases?
-                        pass
-                    else:
-                        obj = cur.obj[*nargs]
+                if (og := ta.get_origin(obj)) is ta.Generic:
+                    # FIXME: None? filter_typing_generic in get_generic_bases?
+                    pass
+                elif (ops := get_params(og)):
+                    if len(ops) != len(args):
+                        raise RuntimeError
+                    nargs = [to_annotation(a) for a in args]
+                    obj = og[*nargs]
             else:
                 obj = None
             return dc.replace(cur, args=args, obj=obj)
@@ -89,6 +90,7 @@ class GenericSubstitution:
                 if isinstance(bty, Generic) and isinstance(b, type):
                     # FIXME: throws away relative types, but can't use original vars as they're class-contextual
                     bty = type_(b[*((ta.Any,) * len(bty.params))])  # type: ignore
+                # rpl2 = {p: rpl[a] for p, a in zip(bty.params, bty.args)}
                 rty = replace_type_vars(bty, rpl, update_aliases=self._update_aliases)
                 ret.append(rty)
             return tuple(ret)

omlish/typedvalues/accessor.py

@@ -14,7 +14,7 @@ from .values import UniqueTypedValue  # noqa
 
 T = ta.TypeVar('T')
 
-TypedValueT = ta.TypeVar('TypedValueT', bound='TypedValue')
+TypedValueT0 = ta.TypeVar('TypedValueT0', bound='TypedValue')
 TypedValueU = ta.TypeVar('TypedValueU', bound='TypedValue')
 
 UniqueTypedValueU = ta.TypeVar('UniqueTypedValueU', bound='UniqueTypedValue')
@@ -27,7 +27,7 @@ class _NOT_SET(lang.Marker):  # noqa
     pass
 
 
-class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
+class TypedValuesAccessor(lang.Abstract, ta.Sequence[TypedValueT0]):
     def __iter__(self):
         raise TypeError(
             'TypedValuesAccessor does not implement __iter__ - it is reserved for implementation by subclasses.',
@@ -36,7 +36,7 @@ class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
     #
 
     @ta.final
-    def __contains__(self, cls: type[TypedValueU]) -> bool:
+    def __contains__(self, cls: type[TypedValueU]) -> bool:  # type: ignore[override]
         return self._typed_value_contains(cls)
 
     @abc.abstractmethod
@@ -45,8 +45,8 @@ class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
 
     #
 
-    @ta.overload
-    def __getitem__(self, idx: int) -> TypedValueT:
+    @ta.overload  # type: ignore[override]
+    def __getitem__(self, idx: int) -> TypedValueT0:
         ...
 
     @ta.overload

omlish/typedvalues/holder.py

@@ -8,20 +8,20 @@ from .generic import TypedValueGeneric
 from .values import TypedValue
 
 
-TypedValueT = ta.TypeVar('TypedValueT', bound=TypedValue)
+TypedValueT1 = ta.TypeVar('TypedValueT1', bound=TypedValue)
 
 
 ##
 
 
 class TypedValueHolder(
-    TypedValuesAccessor[TypedValueT],
-    TypedValueGeneric[TypedValueT],
+    TypedValuesAccessor[TypedValueT1],
+    TypedValueGeneric[TypedValueT1],
     lang.Abstract,
 ):
     @property
     @abc.abstractmethod
-    def _typed_values(self) -> TypedValues[TypedValueT] | None:
+    def _typed_values(self) -> TypedValues[TypedValueT1] | None:
         raise NotImplementedError
 
     #

{omlish-0.0.0.dev328.dist-info → omlish-0.0.0.dev329.dist-info}/METADATA

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

{omlish-0.0.0.dev328.dist-info → omlish-0.0.0.dev329.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=0MrPN5vIAd-Q-O4VVWJF_WDLWv-jHeJBNJZTsBJ_214,3478
+omlish/__about__.py,sha256=JwUnRBh_MVapCgN8U8iae56nu3Vx67AkLzhPkLM7640,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -566,7 +566,7 @@ omlish/os/pidfiles/pinning.py,sha256=aQgCmvcAqN0lvI70GcSB2TKVX1G4vwbyN_AOHF3-eKE
 omlish/reflect/__init__.py,sha256=64eHbD6zL6Fhp7FfXb8n9ZHywlODjBN3rm1LMvZ081A,822
 omlish/reflect/inspect.py,sha256=WCo2YpBYauKw6k758FLlZ_H4Q05rgVPs96fEv9w6zHQ,1538
 omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
-omlish/reflect/subst.py,sha256=g3q7NmNWsmc67mcchmCE3WFPCMDSBq-FXn4ah-DWL_U,3622
+omlish/reflect/subst.py,sha256=CeOxa2v9pMqPlL039C348CBl1iDKWir1xykFC3xFfO8,3744
 omlish/reflect/types.py,sha256=Cn9FYGoiCNt0FS0YLiTTAR12WKcesWMapCrVYcb8IDo,9225
 omlish/secrets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/secrets/all.py,sha256=gv_d9SfyMxso30HsrSz9XmIrSZOdl3rLA5MSH0ZXfgM,486
@@ -849,17 +849,17 @@ omlish/text/antlr/_runtime/xpath/__init__.py,sha256=lMd_BbXYdlDhZQN_q0TKN978XW5G
 omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=N9EYdnFdEX_A8fOviH-1w4jwV3XOQ7VU2WsoUNubYVY,9137
 omlish/typedvalues/__init__.py,sha256=nzpnoRW_wScMPit5Xz37ky3nKBdzzkgtnQA4SfVHN8E,684
-omlish/typedvalues/accessor.py,sha256=5q-JbIUjhzmW6Ui55YepHc1FDAlV13Whkz_TVNvtQ9Q,3064
+omlish/typedvalues/accessor.py,sha256=_NEGBmQ84-h_rDfYeoq7DA20fhj3dogQuvzxXKhjx54,3121
 omlish/typedvalues/collection.py,sha256=a6Je_kmz2FlAV2dI92S7c_paXge0QExMynV-fD9oPrs,5823
 omlish/typedvalues/consumer.py,sha256=peDQAgriSyBx_Hc8QHAhEgYy0oSS52qQ_7Tqdssl2AE,4375
 omlish/typedvalues/generic.py,sha256=byWG_gMXhNelckUwdmOoJE9FKkL71Q4BSi4ZLyy0XZ0,788
-omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,1128
+omlish/typedvalues/holder.py,sha256=vu-umn-h1nvUqmtV5T9ZfQ_OoOYsERu8PhI2N48Ryns,1133
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev328.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev328.dist-info/METADATA,sha256=j4SbGhFfYtXvAosOCJp8sZ1zRExSDAF3wT4rhu7TCQw,4416
-omlish-0.0.0.dev328.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev328.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev328.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev328.dist-info/RECORD,,
+omlish-0.0.0.dev329.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev329.dist-info/METADATA,sha256=RxxJstMcBeaIHqBd5QKW_CW1ljHT00laXL0A3DnX8b4,4416
+omlish-0.0.0.dev329.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev329.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev329.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev329.dist-info/RECORD,,