Move ModelBase.objects declaration to Model.objects, for mypy 1.5.0

mypy 1.5.0 was fixed to understand that metaclass attributes take precedence over attributes in the regular class. So we need to declare `objects` in the regular class to allow it to be overridden in subclasses. Fixes typeddjango#1648. Signed-off-by: Anders Kaseorg <[email protected]>
andersk · Aug 10, 2023 · dc23e4e · dc23e4e
1 parent 325006c
commit dc23e4e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/django-stubs/db/models/base.pyi b/django-stubs/db/models/base.pyi
@@ -19,14 +19,14 @@ class ModelState:
     fields_cache: ModelStateFieldsCacheDescriptor
 
 class ModelBase(type):
-    @property
-    def objects(cls: type[_Self]) -> BaseManager[_Self]: ...  # type: ignore[misc]
     @property
     def _default_manager(cls: type[_Self]) -> BaseManager[_Self]: ...  # type: ignore[misc]
     @property
     def _base_manager(cls: type[_Self]) -> BaseManager[_Self]: ...  # type: ignore[misc]
 
 class Model(metaclass=ModelBase):
+    objects: BaseManager[Self] = ...
+
     DoesNotExist: Final[type[ObjectDoesNotExist]]
     MultipleObjectsReturned: Final[type[BaseMultipleObjectsReturned]]