Fix issues due to variable override checking changes

Bisected to python/mypy#18847

Some of these look valid, others might be due to bugs, e.g. duplicate
note output that might need to be fixed in mypy?

Author: ngnpope

tests/typecheck/contrib/admin/test_options.yml

@@ -18,6 +18,9 @@
       class TestModel(models.Model):
           pass
 
+      class TestModelForm(ModelForm[TestModel]):
+          pass
+
       class A(admin.ModelAdmin[TestModel]):
           # BaseModelAdmin
           autocomplete_fields = ("strs",)
@@ -32,7 +35,7 @@
               ("group", {"fields": ("c",), "classes": ("a",), "description": "foo"}),
               (_("lazy"), {"fields": ["bar"]})
           ]
-          form = ModelForm
+          form = TestModelForm
           filter_vertical = ("fields",)
           filter_horizontal = ("plenty", "of", "fields")
           radio_fields = {

tests/typecheck/db/models/test_fields_choices.yml

@@ -11,6 +11,10 @@
     main:4: note:         def __iter__(self) -> Iterator[Union[Tuple[Any, Any], Tuple[str, Iterable[Tuple[Any, Any]]]]]
     main:4: note:     Got:
     main:4: note:         def __iter__(self) -> Iterator[str]
+    main:4: note:     Expected:
+    main:4: note:         def __iter__(self) -> Iterator[Union[Tuple[Any, Any], Tuple[str, Iterable[Tuple[Any, Any]]]]]
+    main:4: note:     Got:
+    main:4: note:         def __iter__(self) -> Iterator[str]
 
 - case: db_models_integerfield_invalid_choices
   main: |
@@ -25,6 +29,10 @@
     main:4: note:         def __iter__(self) -> Iterator[Union[Tuple[Any, Any], Tuple[str, Iterable[Tuple[Any, Any]]]]]
     main:4: note:     Got:
     main:4: note:         def __iter__(self) -> Iterator[str]
+    main:4: note:     Expected:
+    main:4: note:         def __iter__(self) -> Iterator[Union[Tuple[Any, Any], Tuple[str, Iterable[Tuple[Any, Any]]]]]
+    main:4: note:     Got:
+    main:4: note:         def __iter__(self) -> Iterator[str]
 
 - case: db_models_valid_choices
   main: |

tests/typecheck/fields/test_related.yml

@@ -779,10 +779,10 @@
 -   case: resolve_primary_keys_for_foreign_keys_with_abstract_self_model
     main: |
         from myapp.models import User
-        reveal_type(User().parent)  # N: Revealed type is "myapp.models.User"
+        reveal_type(User().parent)  # N: Revealed type is "myapp.models.AbstractUser"
         reveal_type(User().parent_id)  # N: Revealed type is "builtins.int"
 
-        reveal_type(User().parent2)  # N: Revealed type is "Union[myapp.models.User, None]"
+        reveal_type(User().parent2)  # N: Revealed type is "Union[myapp.models.AbstractUser, None]"
         reveal_type(User().parent2_id)  # N: Revealed type is "Union[builtins.int, None]"
     installed_apps:
         - myapp

tests/typecheck/models/test_meta_options.yml

@@ -66,7 +66,7 @@
             class Meta(TypedModelMeta):
                 abstract = 7  # E: Incompatible types in assignment (expression has type "int", base class "TypedModelMeta" defined the type as "bool")  [assignment]
                 verbose_name = ['test']  # E: Incompatible types in assignment (expression has type "List[str]", base class "TypedModelMeta" defined the type as "Union[str, _StrPromise]")  [assignment]
-                unique_together = {1: 2}  # E: Incompatible types in assignment (expression has type "Dict[int, int]", base class "TypedModelMeta" defined the type as "Union[Sequence[Sequence[str]], Sequence[str]]")  [assignment]
+                unique_together = {1: 2}  # E: Incompatible types in assignment (expression has type "Dict[int, int]", base class "TypedModelMeta" defined the type as "Sequence[Sequence[str]]")  [assignment]
                 unknown_attr = True  # can't check this