Reverse subtype check, add checks for typevar

Author: elazarg

mypy/subtypes.py

@@ -288,7 +288,7 @@ def visit_type_type(self, left: TypeType) -> bool:
                 # treat builtins.object the same as Any.
                 return True
             item = left.item
-            return isinstance(item, Instance) and is_subtype(item, right.type.metaclass_type)
+            return isinstance(item, Instance) and is_subtype(item.type.metaclass_type, right)
         return False
 
 

test-data/unit/check-classes.test

@@ -3137,3 +3137,12 @@ class M(type):
 class A(metaclass=M): pass
 reveal_type(type(A).x)  # E: Revealed type is 'builtins.int'
 
+[case testMetaclassSubtype]
+from typing import Type
+
+class M(type): pass
+class A(metaclass=M): pass
+
+a: Type[A] = A
+m: M = a
+m2: M = A