Remove TupleGetterType

in favour of `api.named_type("collections._tuplegetter")`

Author: Gatsik

mypy/checkmember.py

@@ -61,7 +61,6 @@
     ParamSpecType,
     PartialType,
     ProperType,
-    TupleGetterType,
     TupleType,
     Type,
     TypedDictType,
@@ -936,20 +935,12 @@ def analyze_var(
     return result
 
 
-def expand_tuplegetter_type_if_needed(typ: Type) -> Type:
-    proper = get_proper_type(typ)
-    if isinstance(proper, TupleGetterType):
-        return proper.typ
-    return typ
-
-
 def expand_without_binding(
     typ: Type, var: Var, itype: Instance, original_itype: Instance, mx: MemberContext
 ) -> Type:
     if not mx.preserve_type_var_ids:
         typ = freshen_all_functions_type_vars(typ)
     typ = expand_self_type_if_needed(typ, mx, var, original_itype)
-    typ = expand_tuplegetter_type_if_needed(typ)
     expanded = expand_type_by_instance(typ, itype)
     freeze_all_type_vars(expanded)
     return expanded

mypy/constraints.py

@@ -36,7 +36,6 @@
     ParamSpecType,
     PartialType,
     ProperType,
-    TupleGetterType,
     TupleType,
     Type,
     TypeAliasType,
@@ -1245,9 +1244,6 @@ def infer_against_overloaded(
         item = find_matching_overload_item(overloaded, template)
         return infer_constraints(template, item, self.direction)
 
-    def visit_tuplegetter_type(self, template: TupleGetterType) -> list[Constraint]:
-        raise NotImplementedError
-
     def visit_tuple_type(self, template: TupleType) -> list[Constraint]:
         actual = self.actual
         unpack_index = find_unpack_in_list(template.items)

mypy/copytype.py

@@ -15,7 +15,6 @@
     ParamSpecType,
     PartialType,
     ProperType,
-    TupleGetterType,
     TupleType,
     TypeAliasType,
     TypedDictType,
@@ -104,9 +103,6 @@ def visit_partial_type(self, t: PartialType) -> ProperType:
     def visit_callable_type(self, t: CallableType) -> ProperType:
         return self.copy_common(t, t.copy_modified())
 
-    def visit_tuplegetter_type(self, t: TupleGetterType) -> ProperType:
-        return self.copy_common(t, TupleGetterType(t.typ))
-
     def visit_tuple_type(self, t: TupleType) -> ProperType:
         return self.copy_common(t, TupleType(t.items, t.partial_fallback, implicit=t.implicit))
 

mypy/erasetype.py

@@ -17,7 +17,6 @@
     ParamSpecType,
     PartialType,
     ProperType,
-    TupleGetterType,
     TupleType,
     Type,
     TypeAliasType,
@@ -116,9 +115,6 @@ def visit_callable_type(self, t: CallableType) -> ProperType:
     def visit_overloaded(self, t: Overloaded) -> ProperType:
         return t.fallback.accept(self)
 
-    def visit_tuplegetter_type(self, t: TupleGetterType) -> ProperType:
-        raise NotImplementedError
-
     def visit_tuple_type(self, t: TupleType) -> ProperType:
         return t.partial_fallback.accept(self)
 

mypy/expandtype.py

@@ -23,7 +23,6 @@
     PartialType,
     ProperType,
     TrivialSyntheticTypeTranslator,
-    TupleGetterType,
     TupleType,
     Type,
     TypeAliasType,
@@ -457,9 +456,6 @@ def expand_type_tuple_with_unpack(self, typs: tuple[Type, ...]) -> list[Type]:
                 items.append(item.accept(self))
         return items
 
-    def visit_tuplegetter_type(self, t: TupleGetterType) -> Type:
-        return TupleGetterType(t.typ.accept(self))
-
     def visit_tuple_type(self, t: TupleType) -> Type:
         items = self.expand_type_list_with_unpack(t.items)
         if len(items) == 1:

mypy/fixup.py

@@ -29,7 +29,6 @@
     Overloaded,
     Parameters,
     ParamSpecType,
-    TupleGetterType,
     TupleType,
     TypeAliasType,
     TypedDictType,
@@ -297,9 +296,6 @@ def visit_uninhabited_type(self, o: Any) -> None:
     def visit_partial_type(self, o: Any) -> None:
         raise RuntimeError("Shouldn't get here", o)
 
-    def visit_tuplegetter_type(self, tgt: TupleGetterType) -> None:
-        tgt.typ.accept(self)
-
     def visit_tuple_type(self, tt: TupleType) -> None:
         if tt.items:
             for it in tt.items:

mypy/indirection.py

@@ -128,9 +128,6 @@ def visit_overloaded(self, t: types.Overloaded) -> None:
         self._visit_type_list(list(t.items))
         self._visit(t.fallback)
 
-    def visit_tuplegetter_type(self, t: types.TupleGetterType) -> None:
-        self._visit(t.typ)
-
     def visit_tuple_type(self, t: types.TupleType) -> None:
         self._visit_type_list(t.items)
         self._visit(t.partial_fallback)

mypy/join.py

@@ -32,7 +32,6 @@
     ParamSpecType,
     PartialType,
     ProperType,
-    TupleGetterType,
     TupleType,
     Type,
     TypeAliasType,
@@ -560,9 +559,6 @@ def join_tuples(self, s: TupleType, t: TupleType) -> list[Type] | None:
                 items.append(join_types(fi, vi))
         return items
 
-    def visit_tuplegetter_type(self, t: TupleGetterType) -> ProperType:
-        raise NotImplementedError
-
     def visit_tuple_type(self, t: TupleType) -> ProperType:
         # When given two fixed-length tuples:
         # * If they have the same length, join their subtypes item-wise:

mypy/meet.py

@@ -32,7 +32,6 @@
     ParamSpecType,
     PartialType,
     ProperType,
-    TupleGetterType,
     TupleType,
     Type,
     TypeAliasType,
@@ -1040,9 +1039,6 @@ def meet_tuples(self, s: TupleType, t: TupleType) -> list[Type] | None:
                 items.append(self.meet(fi, vi))
         return items
 
-    def visit_tuplegetter_type(self, t: TupleGetterType) -> ProperType:
-        raise NotImplementedError
-
     def visit_tuple_type(self, t: TupleType) -> ProperType:
         if isinstance(self.s, TupleType):
             items = self.meet_tuples(self.s, t)

mypy/messages.py

@@ -84,7 +84,6 @@
     ParamSpecType,
     PartialType,
     ProperType,
-    TupleGetterType,
     TupleType,
     Type,
     TypeAliasType,
@@ -2665,8 +2664,6 @@ def format_literal_value(typ: LiteralType) -> str:
         else:
             # TODO: better disambiguate ParamSpec name clashes.
             return typ.name_with_suffix()
-    elif isinstance(typ, TupleGetterType):
-        return f"TupleGetterType[{typ.typ}]"
     elif isinstance(typ, TupleType):
         # Prefer the name of the fallback class (if not tuple), as it's more informative.
         if typ.partial_fallback.type.fullname != "builtins.tuple":