Fix mypy==0.710 errors (#97)

* error -> note for revealed type for tests

* fixes for latest mypy

Author: mkurnikov

django-stubs/test/testcases.pyi

@@ -47,7 +47,7 @@ class SimpleTestCase(unittest.TestCase):
     client_class: Any = ...
     client: Client
     allow_database_queries: bool = ...
-    def __call__(self, result: unittest.TestResult = ...) -> None: ...
+    def __call__(self, result: Optional[unittest.TestResult] = ...) -> None: ...
     def settings(self, **kwargs: Any) -> Any: ...
     def modify_settings(self, **kwargs: Any) -> Any: ...
     def assertRedirects(

test-data/typecheck/config.test

@@ -2,7 +2,7 @@
 [env MYPY_DJANGO_CONFIG=${MYPY_CWD}/mypy_django.ini]
 [disable_cache]
 from django.conf import settings
-reveal_type(settings.NO_SUCH_SETTING)  # E: Revealed type is 'Any'
+reveal_type(settings.NO_SUCH_SETTING)  # N: Revealed type is 'Any'
 
 [file mypy_django.ini]
 [[mypy_django_plugin]
@@ -13,7 +13,7 @@ ignore_missing_settings = True
 [env MYPY_DJANGO_CONFIG=${MYPY_CWD}/mypy_django.ini]
 [disable_cache]
 from django.conf import settings
-reveal_type(settings.MY_SETTING)  # E: Revealed type is 'builtins.int'
+reveal_type(settings.MY_SETTING)  # N: Revealed type is 'builtins.int'
 
 [file mypy_django.ini]
 [[mypy_django_plugin]
@@ -26,7 +26,7 @@ MY_SETTING: int = 1
 [CASE mypy_django_ini_in_current_directory_is_a_default]
 [disable_cache]
 from django.conf import settings
-reveal_type(settings.MY_SETTING)  # E: Revealed type is 'builtins.int'
+reveal_type(settings.MY_SETTING)  # N: Revealed type is 'builtins.int'
 
 [file mypy_django.ini]
 [[mypy_django_plugin]

test-data/typecheck/fields.test

@@ -6,7 +6,7 @@ class User(models.Model):
     array = ArrayField(base_field=models.Field())
 
 user = User()
-reveal_type(user.array)  # E: Revealed type is 'builtins.list*[Any]'
+reveal_type(user.array)  # N: Revealed type is 'builtins.list*[Any]'
 [/CASE]
 
 [CASE array_field_base_field_parsed_into_generic_typevar]
@@ -18,8 +18,8 @@ class User(models.Model):
     members_as_text = ArrayField(base_field=models.CharField(max_length=255))
 
 user = User()
-reveal_type(user.members)  # E: Revealed type is 'builtins.list*[builtins.int]'
-reveal_type(user.members_as_text)  # E: Revealed type is 'builtins.list*[builtins.str]'
+reveal_type(user.members)  # N: Revealed type is 'builtins.list*[builtins.int]'
+reveal_type(user.members_as_text)  # N: Revealed type is 'builtins.list*[builtins.str]'
 [/CASE]
 
 [CASE test_model_fields_classes_present_as_primitives]
@@ -33,11 +33,11 @@ class User(models.Model):
     text = models.TextField()
 
 user = User()
-reveal_type(user.id)  # E: Revealed type is 'builtins.int'
-reveal_type(user.small_int)  # E: Revealed type is 'builtins.int*'
-reveal_type(user.name)  # E: Revealed type is 'builtins.str*'
-reveal_type(user.slug)  # E: Revealed type is 'builtins.str*'
-reveal_type(user.text)  # E: Revealed type is 'builtins.str*'
+reveal_type(user.id)  # N: Revealed type is 'builtins.int'
+reveal_type(user.small_int)  # N: Revealed type is 'builtins.int*'
+reveal_type(user.name)  # N: Revealed type is 'builtins.str*'
+reveal_type(user.slug)  # N: Revealed type is 'builtins.str*'
+reveal_type(user.text)  # N: Revealed type is 'builtins.str*'
 [/CASE]
 
 [CASE test_model_field_classes_from_existing_locations]
@@ -51,9 +51,9 @@ class Booking(models.Model):
     some_decimal = models.DecimalField(max_digits=10, decimal_places=5)
 
 booking = Booking()
-reveal_type(booking.id)  # E: Revealed type is 'builtins.int'
-reveal_type(booking.time_range)  # E: Revealed type is 'Any'
-reveal_type(booking.some_decimal)  # E: Revealed type is 'decimal.Decimal*'
+reveal_type(booking.id)  # N: Revealed type is 'builtins.int'
+reveal_type(booking.time_range)  # N: Revealed type is 'Any'
+reveal_type(booking.some_decimal)  # N: Revealed type is 'decimal.Decimal*'
 [/CASE]
 
 [CASE test_add_id_field_if_no_primary_key_defined]
@@ -62,7 +62,7 @@ from django.db import models
 class User(models.Model):
     pass
 
-reveal_type(User().id)  # E: Revealed type is 'builtins.int'
+reveal_type(User().id)  # N: Revealed type is 'builtins.int'
 [/CASE]
 
 [CASE test_do_not_add_id_if_field_with_primary_key_True_defined]
@@ -71,10 +71,10 @@ from django.db import models
 class User(models.Model):
     my_pk = models.IntegerField(primary_key=True)
 
-reveal_type(User().my_pk)  # E: Revealed type is 'builtins.int*'
+reveal_type(User().my_pk)  # N: Revealed type is 'builtins.int*'
 reveal_type(User().id)
 [out]
-main:7: error: Revealed type is 'Any'
+main:7: note: Revealed type is 'Any'
 main:7: error: "User" has no attribute "id"
 [/CASE]
 
@@ -109,7 +109,7 @@ class User(models.Model):
     pass
 reveal_type(User.objects.first().id)
 [out]
-main:4: error: Revealed type is 'Any'
+main:4: note: Revealed type is 'Any'
 main:4: error: Item "None" of "Optional[User]" has no attribute "id"
 [/CASE]
 
@@ -120,7 +120,7 @@ class ParentModel(models.Model):
     pass
 class MyModel(ParentModel):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
-reveal_type(MyModel().id)  # E: Revealed type is 'uuid.UUID'
+reveal_type(MyModel().id)  # N: Revealed type is 'uuid.UUID'
 [/CASE]
 
 [CASE blank_and_null_char_field_allows_none]
@@ -130,7 +130,7 @@ class MyModel(models.Model):
 MyModel(nulltext="")
 MyModel(nulltext=None)
 MyModel().nulltext=None
-reveal_type(MyModel().nulltext)  # E: Revealed type is 'Union[builtins.str, None]'
+reveal_type(MyModel().nulltext)  # N: Revealed type is 'Union[builtins.str, None]'
 [/CASE]
 
 [CASE blank_and_not_null_charfield_does_not_allow_none]
@@ -140,5 +140,5 @@ class MyModel(models.Model):
 MyModel(notnulltext=None)  # Should allow None in constructor
 MyModel(notnulltext="")
 MyModel().notnulltext = None  # E: Incompatible types in assignment (expression has type "None", variable has type "Union[str, int, Combinable]")
-reveal_type(MyModel().notnulltext)  # E: Revealed type is 'builtins.str*'
+reveal_type(MyModel().notnulltext)  # N: Revealed type is 'builtins.str*'
 [/CASE]

test-data/typecheck/forms.test

@@ -33,9 +33,9 @@ class MyView(FormView):
 
     def post(self, request, *args: Any, **kwds: Any):
         form_class = self.get_form_class()
-        reveal_type(form_class)  # E: Revealed type is 'Type[main.MyForm]'
-        reveal_type(self.get_form(None))  # E: Revealed type is 'main.MyForm'
-        reveal_type(self.get_form())  # E: Revealed type is 'main.MyForm'
-        reveal_type(self.get_form(form_class))  # E: Revealed type is 'main.MyForm'
-        reveal_type(self.get_form(MyForm2))  # E: Revealed type is 'main.MyForm2'
+        reveal_type(form_class)  # N: Revealed type is 'Type[main.MyForm]'
+        reveal_type(self.get_form(None))  # N: Revealed type is 'main.MyForm'
+        reveal_type(self.get_form())  # N: Revealed type is 'main.MyForm'
+        reveal_type(self.get_form(form_class))  # N: Revealed type is 'main.MyForm'
+        reveal_type(self.get_form(MyForm2))  # N: Revealed type is 'main.MyForm2'
 [/CASE]

test-data/typecheck/managers.test

@@ -2,25 +2,25 @@
 from django.db import models
 class User(models.Model):
     pass
-reveal_type(User.objects)  # E: Revealed type is 'django.db.models.manager.Manager[main.User]'
-reveal_type(User.objects.get())  # E: Revealed type is 'main.User*'
+reveal_type(User.objects)  # N: Revealed type is 'django.db.models.manager.Manager[main.User]'
+reveal_type(User.objects.get())  # N: Revealed type is 'main.User*'
 
 [CASE every_model_has_its_own_objects_queryset]
 from django.db import models
 class Parent(models.Model):
     pass
 class Child(Parent):
     pass
-reveal_type(Parent.objects)  # E: Revealed type is 'django.db.models.manager.Manager[main.Parent]'
-reveal_type(Child.objects)  # E: Revealed type is 'django.db.models.manager.Manager[main.Child]'
+reveal_type(Parent.objects)  # N: Revealed type is 'django.db.models.manager.Manager[main.Parent]'
+reveal_type(Child.objects)  # N: Revealed type is 'django.db.models.manager.Manager[main.Child]'
 [out]
 
 [CASE if_manager_is_defined_on_model_do_not_add_objects]
 from django.db import models
 
 class MyModel(models.Model):
     authors = models.Manager[MyModel]()
-reveal_type(MyModel.authors)  # E: Revealed type is 'django.db.models.manager.Manager[main.MyModel]'
+reveal_type(MyModel.authors)  # N: Revealed type is 'django.db.models.manager.Manager[main.MyModel]'
 MyModel.objects  # E: "Type[MyModel]" has no attribute "objects"
 [out]
 
@@ -32,15 +32,15 @@ _T = TypeVar('_T', bound=models.Model)
 class Base(Generic[_T]):
     def __init__(self, model_cls: Type[_T]):
         self.model_cls = model_cls
-        reveal_type(self.model_cls._default_manager)  # E: Revealed type is 'django.db.models.manager.Manager[django.db.models.base.Model]'
+        reveal_type(self.model_cls._default_manager)  # N: Revealed type is 'django.db.models.manager.Manager[django.db.models.base.Model]'
 class MyModel(models.Model):
     pass
 base_instance = Base(MyModel)
-reveal_type(base_instance.model_cls._default_manager)  # E: Revealed type is 'django.db.models.manager.Manager[main.MyModel]'
+reveal_type(base_instance.model_cls._default_manager)  # N: Revealed type is 'django.db.models.manager.Manager[main.MyModel]'
 
 class Child(Base[MyModel]):
     def method(self) -> None:
-        reveal_type(self.model_cls._default_manager)  # E: Revealed type is 'django.db.models.manager.Manager[main.MyModel]'
+        reveal_type(self.model_cls._default_manager)  # N: Revealed type is 'django.db.models.manager.Manager[main.MyModel]'
 
 [CASE if_custom_manager_defined_it_is_set_to_default_manager]
 from typing import TypeVar
@@ -50,7 +50,7 @@ class CustomManager(models.Manager[_T]):
     pass
 class MyModel(models.Model):
     manager = CustomManager[MyModel]()
-reveal_type(MyModel._default_manager)  # E: Revealed type is 'main.CustomManager[main.MyModel]'
+reveal_type(MyModel._default_manager)  # N: Revealed type is 'main.CustomManager[main.MyModel]'
 
 [CASE if_default_manager_name_is_passed_set_default_manager_to_it]
 from typing import TypeVar
@@ -66,7 +66,7 @@ class MyModel(models.Model):
         default_manager_name = 'm2'
     m1: Manager1[MyModel]
     m2: Manager2[MyModel]
-reveal_type(MyModel._default_manager)  # E: Revealed type is 'main.Manager2[main.MyModel]'
+reveal_type(MyModel._default_manager)  # N: Revealed type is 'main.Manager2[main.MyModel]'
 
 [CASE test_leave_as_is_if_objects_is_set_and_fill_typevars_with_outer_class]
 from django.db import models
@@ -78,18 +78,18 @@ class UserManager(models.Manager[MyUser]):
 class MyUser(models.Model):
     objects = UserManager()
 
-reveal_type(MyUser.objects)  # E: Revealed type is 'main.UserManager[main.MyUser]'
-reveal_type(MyUser.objects.get())  # E: Revealed type is 'main.MyUser*'
-reveal_type(MyUser.objects.get_or_404())  # E: Revealed type is 'main.MyUser'
+reveal_type(MyUser.objects)  # N: Revealed type is 'main.UserManager[main.MyUser]'
+reveal_type(MyUser.objects.get())  # N: Revealed type is 'main.MyUser*'
+reveal_type(MyUser.objects.get_or_404())  # N: Revealed type is 'main.MyUser'
 
 [CASE model_imported_from_different_file]
 from django.db import models
 from models.main import Inventory
 
 class Band(models.Model):
     pass
-reveal_type(Inventory.objects)  # E: Revealed type is 'django.db.models.manager.Manager[models.main.Inventory]'
-reveal_type(Band.objects)  # E: Revealed type is 'django.db.models.manager.Manager[main.Band]'
+reveal_type(Inventory.objects)  # N: Revealed type is 'django.db.models.manager.Manager[models.main.Inventory]'
+reveal_type(Band.objects)  # N: Revealed type is 'django.db.models.manager.Manager[main.Band]'
 [file models/__init__.py]
 [file models/main.py]
 from django.db import models
@@ -110,10 +110,10 @@ class Book(models.Model):
     published_objects = PublishedBookManager()
     annotated_objects = AnnotatedBookManager()
 
-reveal_type(AbstractPerson.abstract_persons)  # E: Revealed type is 'django.db.models.manager.Manager[main.AbstractPerson]'
-reveal_type(Book.published_objects)  # E: Revealed type is 'main.PublishedBookManager[main.Book]'
+reveal_type(AbstractPerson.abstract_persons)  # N: Revealed type is 'django.db.models.manager.Manager[main.AbstractPerson]'
+reveal_type(Book.published_objects)  # N: Revealed type is 'main.PublishedBookManager[main.Book]'
 Book.published_objects.create(title='hello')
-reveal_type(Book.annotated_objects)  # E: Revealed type is 'main.AnnotatedBookManager[main.Book]'
+reveal_type(Book.annotated_objects)  # N: Revealed type is 'main.AnnotatedBookManager[main.Book]'
 Book.annotated_objects.create(title='hello')
 [out]
 
@@ -149,11 +149,11 @@ class UnrelatedModel(models.Model):
 class MyModel(models.Model):
     pass
 
-reveal_type(UnrelatedModel.objects) # E: Revealed type is 'django.db.models.manager.Manager[main.UnrelatedModel]'
-reveal_type(UnrelatedModel.objects.first()) # E: Revealed type is 'Union[main.UnrelatedModel*, None]'
+reveal_type(UnrelatedModel.objects) # N: Revealed type is 'django.db.models.manager.Manager[main.UnrelatedModel]'
+reveal_type(UnrelatedModel.objects.first()) # N: Revealed type is 'Union[main.UnrelatedModel*, None]'
 
-reveal_type(MyModel.objects) # E: Revealed type is 'django.db.models.manager.Manager[main.MyModel]'
-reveal_type(MyModel.objects.first()) # E: Revealed type is 'Union[main.MyModel*, None]'
+reveal_type(MyModel.objects) # N: Revealed type is 'django.db.models.manager.Manager[main.MyModel]'
+reveal_type(MyModel.objects.first()) # N: Revealed type is 'Union[main.MyModel*, None]'
 
 # Possible to specify objects without explicit annotation of models.Manager()
 class UnrelatedModel2(models.Model):
@@ -162,11 +162,11 @@ class UnrelatedModel2(models.Model):
 class MyModel2(models.Model):
     pass
 
-reveal_type(UnrelatedModel2.objects) # E: Revealed type is 'django.db.models.manager.Manager[main.UnrelatedModel2]'
-reveal_type(UnrelatedModel2.objects.first()) # E: Revealed type is 'Union[main.UnrelatedModel2*, None]'
+reveal_type(UnrelatedModel2.objects) # N: Revealed type is 'django.db.models.manager.Manager[main.UnrelatedModel2]'
+reveal_type(UnrelatedModel2.objects.first()) # N: Revealed type is 'Union[main.UnrelatedModel2*, None]'
 
-reveal_type(MyModel2.objects) # E: Revealed type is 'django.db.models.manager.Manager[main.MyModel2]'
-reveal_type(MyModel2.objects.first()) # E: Revealed type is 'Union[main.MyModel2*, None]'
+reveal_type(MyModel2.objects) # N: Revealed type is 'django.db.models.manager.Manager[main.MyModel2]'
+reveal_type(MyModel2.objects.first()) # N: Revealed type is 'Union[main.MyModel2*, None]'
 
 
 # Inheritance works
@@ -177,11 +177,11 @@ class MyModel3(ParentOfMyModel3):
     pass
 
 
-reveal_type(ParentOfMyModel3.objects) # E: Revealed type is 'django.db.models.manager.Manager[main.ParentOfMyModel3]'
-reveal_type(ParentOfMyModel3.objects.first()) # E: Revealed type is 'Union[main.ParentOfMyModel3*, None]'
+reveal_type(ParentOfMyModel3.objects) # N: Revealed type is 'django.db.models.manager.Manager[main.ParentOfMyModel3]'
+reveal_type(ParentOfMyModel3.objects.first()) # N: Revealed type is 'Union[main.ParentOfMyModel3*, None]'
 
-reveal_type(MyModel3.objects) # E: Revealed type is 'django.db.models.manager.Manager[main.MyModel3]'
-reveal_type(MyModel3.objects.first()) # E: Revealed type is 'Union[main.MyModel3*, None]'
+reveal_type(MyModel3.objects) # N: Revealed type is 'django.db.models.manager.Manager[main.MyModel3]'
+reveal_type(MyModel3.objects.first()) # N: Revealed type is 'Union[main.MyModel3*, None]'
 
 
 # Inheritance works with explicit objects in child
@@ -191,11 +191,11 @@ class ParentOfMyModel4(models.Model):
 class MyModel4(ParentOfMyModel4):
     objects = models.Manager[MyModel4]()
 
-reveal_type(ParentOfMyModel4.objects) # E: Revealed type is 'django.db.models.manager.Manager[main.ParentOfMyModel4]'
-reveal_type(ParentOfMyModel4.objects.first()) # E: Revealed type is 'Union[main.ParentOfMyModel4*, None]'
+reveal_type(ParentOfMyModel4.objects) # N: Revealed type is 'django.db.models.manager.Manager[main.ParentOfMyModel4]'
+reveal_type(ParentOfMyModel4.objects.first()) # N: Revealed type is 'Union[main.ParentOfMyModel4*, None]'
 
-reveal_type(MyModel4.objects) # E: Revealed type is 'django.db.models.manager.Manager[main.MyModel4]'
-reveal_type(MyModel4.objects.first()) # E: Revealed type is 'Union[main.MyModel4*, None]'
+reveal_type(MyModel4.objects) # N: Revealed type is 'django.db.models.manager.Manager[main.MyModel4]'
+reveal_type(MyModel4.objects.first()) # N: Revealed type is 'Union[main.MyModel4*, None]'
 
 
 [out]

test-data/typecheck/migrations.test

@@ -5,8 +5,8 @@ if TYPE_CHECKING:
     from myapp.models import User
 apps = Apps()
 model_cls = apps.get_model('myapp', 'User')
-reveal_type(model_cls)  # E: Revealed type is 'Type[myapp.models.User]'
-reveal_type(model_cls.objects)  # E: Revealed type is 'django.db.models.manager.Manager[myapp.models.User]'
+reveal_type(model_cls)  # N: Revealed type is 'Type[myapp.models.User]'
+reveal_type(model_cls.objects)  # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.User]'
 
 [file myapp/__init__.py]
 [file myapp/models.py]
@@ -23,7 +23,7 @@ app_name = 'myapp'
 model_name = 'User'
 apps = Apps()
 model_cls = apps.get_model(app_name, model_name)
-reveal_type(model_cls)  # E: Revealed type is 'Type[django.db.models.base.Model]'
+reveal_type(model_cls)  # N: Revealed type is 'Type[django.db.models.base.Model]'
 
 [file myapp/__init__.py]
 [file myapp/models.py]
@@ -38,8 +38,8 @@ if TYPE_CHECKING:
     from myapp.models import User
 apps = StateApps([], {})
 model_cls = apps.get_model('myapp', 'User')
-reveal_type(model_cls)  # E: Revealed type is 'Type[myapp.models.User]'
-reveal_type(model_cls.objects)  # E: Revealed type is 'django.db.models.manager.Manager[myapp.models.User]'
+reveal_type(model_cls)  # N: Revealed type is 'Type[myapp.models.User]'
+reveal_type(model_cls.objects)  # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.User]'
 
 [file myapp/__init__.py]
 [file myapp/models.py]

test-data/typecheck/model.test

@@ -30,12 +30,12 @@ class B(models.Model):
     pass
 
 b_instance = B()
-reveal_type(b_instance.b_attr) # E: Revealed type is 'builtins.int'
+reveal_type(b_instance.b_attr) # N: Revealed type is 'builtins.int'
 
 reveal_type(b_instance.non_existent_attribute)
 b_instance.non_existent_attribute = 2
 [out]
-main:10: error: Revealed type is 'Any'
+main:10: note: Revealed type is 'Any'
 main:10: error: "B" has no attribute "non_existent_attribute"
 main:11: error: "B" has no attribute "non_existent_attribute"
 [/CASE]
@@ -48,7 +48,7 @@ class B(models.Model):
     pass
 
 b_instance = B()
-reveal_type(b_instance.non_existent_attribute) # E: Revealed type is 'Any'
+reveal_type(b_instance.non_existent_attribute) # N: Revealed type is 'Any'
 b_instance.non_existent_attribute = 2
 
 [env MYPY_DJANGO_CONFIG=${MYPY_CWD}/mypy_django.ini]

test-data/typecheck/model_create.test

@@ -28,15 +28,11 @@ class Parent2(models.Model):
     id2 = models.AutoField(primary_key=True)
     name2 = models.CharField(max_length=50)
 
-# TODO: Remove the 2 expected errors on the next line once mypy issue https://github.com/python/mypy/issues/2619 is resolved:
 class Child1(Parent1, Parent2):
     value = models.IntegerField()
 class Child4(Child1):
     value4 = models.IntegerField()
 Child4.objects.create(name1='n1', name2='n2', value=1, value4=4)
-[out]
-main:10: error: Definition of "objects" in base class "Parent1" is incompatible with definition in base class "Parent2"
-main:10: error: Definition of "_default_manager" in base class "Parent1" is incompatible with definition in base class "Parent2"
 
 [CASE optional_primary_key_for_create_is_error]
 from django.db import models