Merge remote-tracking branch 'origin/master' into gobot-master

python · Gobot1234 · Aug 28, 2021 · Oct 2, 2021 · Nov 5, 2021 · Dec 5, 2021
commit ad0b9b057c54ced60c4936a220dae182d5d9cb14
diff --git a/mypy/constraints.py b/mypy/constraints.py
@@ -7,9 +7,8 @@
     CallableType, Type, TypeVisitor, UnboundType, AnyType, NoneType, TypeVarType, Instance,
     TupleType, TypedDictType, UnionType, Overloaded, ErasedType, PartialType, DeletedType,
     UninhabitedType, TypeType, TypeVarId, TypeQuery, is_named_instance, TypeOfAny, LiteralType,
-    ProperType, ParamSpecType, get_proper_type, TypeAliasType, SelfType, is_union_with_any,
-    callable_with_ellipsis,
-    TUPLE_LIKE_INSTANCE_NAMES,
+    ProperType, ParamSpecType, get_proper_type, TypeAliasType, is_union_with_any, SelfType,
+    UnpackType, callable_with_ellipsis, Parameters, TUPLE_LIKE_INSTANCE_NAMES, TypeVarTupleType,
 )
 from mypy.maptype import map_instance_to_supertype
 import mypy.subtypes

diff --git a/mypy/erasetype.py b/mypy/erasetype.py
@@ -4,7 +4,8 @@
     Type, TypeVisitor, UnboundType, AnyType, NoneType, TypeVarId, Instance, TypeVarType,
     CallableType, TupleType, TypedDictType, UnionType, Overloaded, ErasedType, PartialType,
     DeletedType, TypeTranslator, UninhabitedType, TypeType, TypeOfAny, LiteralType, ProperType,
-    get_proper_type, get_proper_types, TypeAl
8000
iasType, ParamSpecType, SelfType
+    get_proper_type, get_proper_types, TypeAliasType, ParamSpecType, Parameters, UnpackType,
+    TypeVarTupleType, SelfType,
 )
 from mypy.nodes import ARG_STAR, ARG_STAR2
 

diff --git a/mypy/expandtype.py b/mypy/expandtype.py
@@ -5,7 +5,8 @@
     NoneType, Overloaded, TupleType, TypedDictType, UnionType,
     ErasedType, PartialType, DeletedType, UninhabitedType, TypeType, TypeVarId,
     FunctionLike, TypeVarType, LiteralType, get_proper_type, ProperType,
-    TypeAliasType, ParamSpecType, SelfType, TypeVarLikeType
+    TypeAliasType, ParamSpecType, TypeVarLikeType, Parameters, ParamSpecFlavor,
+    UnpackType, TypeVarTupleType, SelfType,
 )
 
 

diff --git a/mypy/fixup.py b/mypy/fixup.py
@@ -10,8 +10,8 @@
 from mypy.types import (
     CallableType, Instance, Overloaded, TupleType, TypedDictType,
     TypeVarType, UnboundType, UnionType, TypeVisitor, LiteralType,
-    TypeType, NOT_READY, TypeAliasType, AnyType, TypeOfAny, ParamSpecType, 
-    SelfType
+    TypeType, NOT_READY, TypeAliasType, AnyType, TypeOfAny, ParamSpecType,
+    Parameters, UnpackType, TypeVarTupleType, SelfType,
 )
 from mypy.visitor import NodeVisitor
 from mypy.lookup import lookup_fully_qualified

diff --git a/mypy/join.py b/mypy/join.py
@@ -7,7 +7,8 @@
     Type, AnyType, NoneType, TypeVisitor, Instance, UnboundType, TypeVarType, CallableType,
     TupleType, TypedDictType, ErasedType, UnionType, FunctionLike, Overloaded, LiteralType,
     PartialType, DeletedType, UninhabitedType, TypeType, TypeOfAny, get_proper_type,
-    ProperType, get_proper_types, TypeAliasType, PlaceholderType, ParamSpecType, SelfType
+    ProperType, get_proper_types, TypeAliasType, PlaceholderType, ParamSpecType, Parameters,
+    UnpackType, TypeVarTupleType, SelfType,
 )
 from mypy.maptype import map_instance_to_supertype
 from mypy.subtypes import (

diff --git a/mypy/meet.py b/mypy/meet.py
@@ -5,8 +5,8 @@
     Type, AnyType, TypeVisitor, UnboundType, NoneType, TypeVarType, Instance, CallableType,
     TupleType, TypedDictType, ErasedType, UnionType, PartialType, DeletedType,
     UninhabitedType, TypeType, TypeOfAny, Overloaded, FunctionLike, LiteralType,
-    ProperType, get_proper_type, get_proper_types, TypeAliasType, TypeGuardedType, SelfType,
-    ParamSpecType
+    ProperType, get_proper_type, get_proper_types, TypeAliasType, TypeGuardedType,
+    ParamSpecType, Parameters, UnpackType, TypeVarTupleType, SelfType,
 )
 from mypy.subtypes import is_equivalent, is_subtype, is_callable_compatible, is_proper_subtype
 from mypy.erasetype import erase_type

diff --git a/mypy/sametypes.py b/mypy/sametypes.py
@@ -4,7 +4,8 @@
     Type, UnboundType, AnyType, NoneType, TupleType, TypedDictType,
     UnionType, CallableType, TypeVarType, Instance, TypeVisitor, ErasedType,
     Overloaded, PartialType, DeletedType, UninhabitedType, TypeType, LiteralType,
-    ProperType, get_proper_type, TypeAliasType, SelfType, ParamSpecType
+    ProperType, get_proper_type, TypeAliasType, ParamSpecType, Parameters,
+    UnpackType, TypeVarTupleType, SelfType,
 )
 from mypy.typeops import tuple_fallback, make_simplified_union, is_simple_literal
 

diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -97,9 +97,9 @@
     NEVER_NAMES, FunctionLike, UnboundType, TypeVarType, TupleType, UnionType, StarType,
     CallableType, Overloaded, Instance, Type, AnyType, LiteralType, LiteralValue,
     TypeTranslator, TypeOfAny, TypeType, NoneType, PlaceholderType, TPDICT_NAMES, ProperType,
-    get_proper_type, get_proper_types, TypeAliasType, SelfType,  TypeVarLikeType,
+    get_proper_type, get_proper_types, TypeAliasType, TypeVarLikeType, Parameters, ParamSpecType,
     PROTOCOL_NAMES, TYPE_ALIAS_NAMES, FINAL_TYPE_NAMES, FINAL_DECORATOR_NAMES, REVEAL_TYPE_NAMES,
-    ASSERT_TYPE_NAMES, OVERLOAD_NAMES, is_named_instance,
+    ASSERT_TYPE_NAMES, OVERLOAD_NAMES, is_named_instance, SelfType,
 )
 from mypy.typeops import function_type, get_type_vars
 from mypy.type_visitor import TypeQuery

diff --git a/mypy/server/astdiff.py b/mypy/server/astdiff.py
@@ -60,7 +60,7 @@ class level -- these are handled at attribute level (say, 'mod.Cls.method'
     Type, TypeVisitor, UnboundType, AnyType, NoneType, UninhabitedType,
     ErasedType, DeletedType, Instance, TypeVarType, CallableType, TupleType, TypedDictType,
     UnionType, Overloaded, PartialType, TypeType, LiteralType, TypeAliasType, ParamSpecType,
-    SelfType
+    Parameters, UnpackType, TypeVarTupleType, SelfType,
 )
 from mypy.util import get_prefix
 
@@ -318,6 +318,21 @@ def visit_param_spec(self, typ: ParamSpecType) -> SnapshotItem:
                 typ.flavor,
                 snapshot_type(typ.upper_bound))
 
+    def visit_type_var_tuple(self, typ: TypeVarTupleType) -> SnapshotItem:
+        return ('TypeVarTupleType',
+                typ.id.raw_id,
+                typ.id.meta_level,
+                snapshot_type(typ.upper_bound))
+
+    def visit_unpack_type(self, typ: UnpackType) -> SnapshotItem:
+        return ('UnpackType', snapshot_type(typ.type))
+
+    def visit_parameters(self, typ: Parameters) -> SnapshotItem:
+        return ('Parameters',
+                snapshot_types(typ.arg_types),
+                tuple(encode_optional_str(name) for name in typ.arg_names),
+                tuple(typ.arg_kinds))
+
     def visit_self_type(self, typ: SelfType) -> SnapshotItem:
         return ('SelfType',
                 typ.fullname,

diff --git a/mypy/server/astmerge.py b/mypy/server/astmerge.py
@@ -59,7 +59,8 @@
     Type, SyntheticTypeVisitor, Instance, AnyType, NoneType, CallableType, ErasedType, DeletedType,
     TupleType, TypeType, TypedDictType, UnboundType, UninhabitedType, UnionType,
     Overloaded, TypeVarType, TypeList, CallableArgument, EllipsisType, StarType, LiteralType,
-    RawExpressionType, PartialType, PlaceholderType, TypeAliasType, ParamSpecType, SelfType
+    RawExpressionType, PartialType, PlaceholderType, TypeAliasType, ParamSpecType, Parameters,
+    UnpackType, TypeVarTupleType, SelfType,
 )
 from mypy.util import get_prefix, replace_object_state
 from mypy.typestate import TypeState
@@ -415,6 +416,16 @@ def visit_type_var(self, typ: TypeVarType) -> None:
     def visit_param_spec(self, typ: ParamSpecType) -> None:
         pass
 
+    def visit_type_var_tuple(self, typ: TypeVarTupleType) -> None:
+        typ.upper_bound.accept(self)
+
+    def visit_unpack_type(self, typ: UnpackType) -> None:
+        typ.type.accept(self)
+
+    def visit_parameters(self, typ: Parameters) -> None:
+        for arg in typ.arg_types:
+            arg.accept(self)
+
     def visit_self_type(self, typ: SelfType) -> None:
         typ.instance.accept(self)
 

diff --git a/mypy/server/deps.py b/mypy/server/deps.py
@@ -100,7 +100,7 @@ class 'mod.Cls'. This can also refer to an attribute inherited from a
     Type, Instance, AnyType, NoneType, TypeVisitor, CallableType, DeletedType, PartialType,
     TupleType, TypeType, TypeVarType, TypedDictType, UnboundType, UninhabitedType, UnionType,
     FunctionLike, Overloaded, TypeOfAny, LiteralType, ErasedType, get_proper_type, ProperType,
-    TypeAliasType, ParamSpecType, SelfType
+    TypeAliasType, ParamSpecType, Parameters, UnpackType, TypeVarTupleType, SelfType,
 )
 from mypy.server.trigger import make_trigger, make_wildcard_trigger
 from mypy.util import correct_relative_import
@@ -966,6 +966,22 @@ def visit_param_spec(self, typ: ParamSpecType) -> List[str]:
         triggers.extend(self.get_type_triggers(typ.upper_bound))
         return triggers
 
+    def visit_type_var_tuple(self, typ: TypeVarTupleType) -> List[str]:
+        triggers = []
+        if typ.fullname:
+            triggers.append(make_trigger(typ.fullname))
+        triggers.extend(self.get_type_triggers(typ.upper_bound))
+        return triggers
+
+    def visit_unpack_type(self, typ: UnpackType) -> List[str]:
+        return typ.type.accept(self)
+
+    def visit_parameters(self, typ: Parameters) -> List[str]:
+        triggers = []
+        for arg in typ.arg_types:
+            triggers.extend(self.get_type_triggers(arg))
+        return triggers
+
     def visit_self_type(self, typ: SelfType) -> List[str]:
         triggers = []
         if typ.fullname:

diff --git a/mypy/subtypes.py b/mypy/subtypes.py
@@ -8,8 +8,7 @@
     Instance, TypeVarType, CallableType, TupleType, TypedDictType, UnionType, Overloaded,
     ErasedType, PartialType, DeletedType, UninhabitedType, TypeType, is_named_instance,
     FunctionLike, TypeOfAny, LiteralType, get_proper_type, TypeAliasType, ParamSpecType,
-    SelfType,
-    TUPLE_LIKE_INSTANCE_NAMES,
+    Parameters, UnpackType, TUPLE_LIKE_INSTANCE_NAMES, TypeVarTupleType, SelfType,
 )
 import mypy.applytype
 import mypy.constraints

diff --git a/mypy/type_visitor.py b/mypy/type_visitor.py
@@ -23,7 +23,8 @@
     Parameters, RawExpressionType, Instance, NoneType, TypeType,
     UnionType, TypeVarType, PartialType, DeletedType, UninhabitedType, TypeVarLikeType,
     UnboundType, ErasedType, StarType, EllipsisType, TypeList, CallableArgument,
-    PlaceholderType, TypeAliasType, ParamSpecType, SelfType, get_proper_type
+    PlaceholderType, TypeAliasType, ParamSpecType, UnpackType, TypeVarTupleType,
+    get_proper_type, SelfType,
 )
 
 

diff --git a/mypy/typeanal.py b/mypy/typeanal.py
@@ -16,8 +16,9 @@
     StarType, PartialType, EllipsisType, UninhabitedType, TypeType, CallableArgument,
     Parameters, TypeQuery, union_items, TypeOfAny, LiteralType, RawExpressionType,
     PlaceholderType, Overloaded, get_proper_type, TypeAliasType, RequiredType,
-    TypeVarLikeType, ParamSpecType, ParamSpecFlavor, SelfType, callable_with_ellipsis,
-    TYPE_ALIAS_NAMES, FINAL_TYPE_NAMES, LITERAL_TYPE_NAMES, ANNOTATED_TYPE_NAMES,
+    TypeVarLikeType, ParamSpecType, ParamSpecFlavor, UnpackType, TypeVarTupleType,
+    callable_with_ellipsis, TYPE_ALIAS_NAMES, FINAL_TYPE_NAMES,
+    LITERAL_TYPE_NAMES, ANNOTATED_TYPE_NAMES, SelfType,
 )
 
 from mypy.nodes import (

diff --git a/mypy/typeops.py b/mypy/typeops.py
@@ -15,8 +15,7 @@
     TupleType, Instance, FunctionLike, Type, CallableType, TypeVarLikeType, Overloaded,
     TypeVarType, UninhabitedType, FormalArgument, UnionType, NoneType,
     AnyType, TypeOfAny, TypeType, ProperType, LiteralType, get_proper_type, get_proper_types,
-    copy_type, TypeAliasType, TypeQuery, ParamSpecType, SelfType,
-    ENUM_REMOVED_PROPS
+    TypeAliasType, TypeQuery, ParamSpecType, Parameters, ENUM_REMOVED_PROPS,
 )
 from mypy.nodes import (
     FuncBase, FuncItem, FuncDef, OverloadedFuncDef, TypeInfo, ARG_STAR, ARG_STAR2, ARG_POS,

diff --git a/mypy/typetraverser.py b/mypy/typetraverser.py
@@ -6,7 +6,8 @@
     Type, SyntheticTypeVisitor, AnyType, UninhabitedType, NoneType, ErasedType, DeletedType,
     TypeVarType, LiteralType, Instance, CallableType, TupleType, TypedDictType, UnionType,
     Overloaded, TypeType, CallableArgument, UnboundType, TypeList, StarType, EllipsisType,
-    PlaceholderType, PartialType, RawExpressionType, TypeAliasType, ParamSpecType, SelfType,
+    PlaceholderType, PartialType, RawExpressionType, TypeAliasType, ParamSpecType, Parameters,
+    UnpackType, TypeVarTupleType, SelfType,
 )