Fix expandtype

Author: cdce8p

mypy/expandtype.py

@@ -133,7 +133,7 @@ def freshen_function_type_vars(callee: F) -> F:
                 except KeyError:
                     tv.default = tv.default.default
             tvs.append(tv)
-            tvmap[tv.id] = tv
+            tvmap[v.id] = tv
         fresh = expand_type(callee, tvmap).copy_modified(variables=tvs)
         return cast(F, fresh)
     else:

mypy/types.py

@@ -522,21 +522,15 @@ def __eq__(self, other: object) -> bool:
         return (
             isinstance(other, TypeVarId)
             and self.raw_id == other.raw_id
-            # and self.meta_level == other.meta_level  # TODO this probably breaks a lot of stuff
+            and self.meta_level == other.meta_level  # TODO this probably breaks a lot of stuff
             and self.namespace == other.namespace
         )
 
     def __ne__(self, other: object) -> bool:
         return not (self == other)
 
     def __hash__(self) -> int:
-        return hash(
-            (
-                self.raw_id,
-                # self.meta_level,
-                self.namespace,
-            )
-        )
+        return hash((self.raw_id, self.meta_level, self.namespace))
 
     def is_meta_var(self) -> bool:
         return self.meta_level > 0
@@ -583,7 +577,7 @@ def copy_modified(self, *, id: TypeVarId, **kwargs: Any) -> Self:
     @classmethod
     def new_unification_variable(cls, old: Self) -> Self:
         new_id = TypeVarId.new(meta_level=1)
-        new_id.raw_id = old.id.raw_id
+        # new_id.raw_id = old.id.raw_id
         new_id.namespace = old.id.namespace
         return old.copy_modified(id=new_id)