Polish work

python · JukkaL · Apr 7, 2022 · Dec 24, 2021 · Dec 25, 2021 · Dec 26, 2021
commit 24432ee4afdfebd23de1e5e4c14a95a88578ff9a
diff --git a/mypy/constraints.py b/mypy/constraints.py
@@ -446,6 +446,7 @@ def visit_instance(self, template: Instance) -> List[Constraint]:
                 # N.B: We use zip instead of indexing because the lengths might have
                 # mismatches during daemon reprocessing.
                 for tvar, mapped_arg, instance_arg in zip(tvars, mapped.args, instance.args):
+                    # TODO(PEP612): More ParamSpec work (or is Parameters the only thing accepted)
                     if isinstance(tvar, TypeVarType):
                         # The constraints for generic type parameters depend on variance.
                         # Include constraints from both directions if invariant.
@@ -455,16 +456,17 @@ def visit_instance(self, template: Instance) -> List[Constraint]:
                         if tvar.variance != COVARIANT:
                             res.extend(infer_constraints(
                                 mapped_arg, instance_arg, neg_op(self.direction)))
-                    elif isinstance(tvar, ParamSpecType):
-                        # no such thing as variance for ParamSpecs
-                        # TODO: is there a case I am missing?
-                        # TODO: what is setting meta_level to 0?
-                        suffix = template_arg
-                        prefix = mapped_arg.prefix
-                        suffix = suffix.copy_modified(suffix.arg_types[len(prefix.arg_types):],
-                                                      suffix.arg_kinds[len(prefix.arg_kinds):],
-                                                      suffix.arg_names[len(prefix.arg_names):])
-                        res.append(Constraint(mapped_arg.id, SUPERTYPE_OF, suffix))
+                    elif isinstance(tvar, ParamSpecType) and isinstance(mapped_arg, ParamSpecType):
+                        suffix = get_proper_type(instance_arg)
+                        if isinstance(suffix, Parameters):
+                            # no such thing as variance for ParamSpecs
+                            # TODO: is there a case I am missing?
+                            # TODO: what is setting meta_level to 0?
+                            prefix = mapped_arg.prefix
+                            suffix = suffix.copy_modified(suffix.arg_types[len(prefix.arg_types):],
+                                                          suffix.arg_kinds[len(prefix.arg_kinds):],
+                                                          suffix.arg_names[len(prefix.arg_names):])
+                            res.append(Constraint(mapped_arg.id, SUPERTYPE_OF, suffix))
                 return res
             elif (self.direction == SUPERTYPE_OF and
                     instance.type.has_base(template.type.fullname)):
@@ -482,16 +484,17 @@ def visit_instance(self, template: Instance) -> List[Constraint]:
                         if tvar.variance != COVARIANT:
                             res.extend(infer_constraints(
                                 template_arg, mapped_arg, neg_op(self.direction)))
-                    elif isinstance(tvar, ParamSpecType):
-                        # no such thing as variance for ParamSpecs
-                        # TODO: is there a case I am missing?
-                        # TODO: what is setting meta_level to 0?
-                        suffix = mapped_arg
-                        prefix = template_arg.prefix
-                        suffix = suffix.copy_modified(suffix.arg_types[len(prefix.arg_types):],
-                                                      suffix.arg_kinds[len(prefix.arg_kinds):],
-                                                      suffix.arg_names[len(prefix.arg_names):])
-                        res.append(Constraint(template_arg.id, SUPERTYPE_OF, suffix))
+                    elif isinstance(tvar, ParamSpecType) and isinstance(template_arg, ParamSpecType):
+                        suffix = get_proper_type(mapped_arg)
+                        if isinstance(suffix, Parameters):
+                            # no such thing as variance for ParamSpecs
+                            # TODO: is there a case I am missing?
+                            # TODO: what is setting meta_level to 0?
+                            prefix = template_arg.prefix
+                            suffix = suffix.copy_modified(suffix.arg_types[len(prefix.arg_types):],
+                                                          suffix.arg_kinds[len(prefix.arg_kinds):],
+                                                          suffix.arg_names[len(prefix.arg_names):])
+                            res.append(Constraint(template_arg.id, SUPERTYPE_OF, suffix))
                 return res
             if (template.type.is_protocol and self.direction == SUPERTYPE_OF and
                     # We avoid infinite recursion for structural subtypes by checking

diff --git a/mypy/typeanal.py b/mypy/typeanal.py
@@ -281,7 +281,7 @@ def cannot_resolve_type(self, t: UnboundType) -> None:
             'Cannot resolve name "{}" (possible cyclic definition)'.format(t.name),
             t)
 
-    def apply_concatenate_operator(self, t: UnboundType) -> Optional[ParamSpecType]:
+    def apply_concatenate_operator(self, t: UnboundType) -> Type:
         if len(t.args) == 0:
             self.api.fail('Concatenate needs type arguments', t)
             return AnyType(TypeOfAny.from_error)
@@ -295,9 +295,13 @@ def apply_concatenate_operator(self, t: UnboundType) -> Optional[ParamSpecType]:
 
         args = self.anal_array(t.args[:-1])
         pre = ps.prefix
+
+        # mypy can't infer this :(
+        names: List[Optional[str]] = [None] * len(args)
+
         pre = Para
A6A9
meters(args + pre.arg_types,
                          [ARG_POS] * len(args) + pre.arg_kinds,
-                         [None] * len(args) + pre.arg_names)
+                         names + pre.arg_names)
         return ps.copy_modified(prefix=pre)
 
     def try_analyze_special_unbound_type(self, t: UnboundType, fullname: str) -> Optional[Type]:

diff --git a/mypy/types.py b/mypy/types.py
@@ -568,7 +568,7 @@ def deserialize(cls, data: JsonDict) -> 'ParamSpecType':
             data['id'],
             data['flavor'],
             deserialize_type(data['upper_bound']),
-            prefix=deserialize_type(data['prefix'])
+            prefix=Parameters.deserialize(data['prefix'])
         )