Fix site model typing and reorder SiteManger

Author: ahmedasar00

django-stubs/contrib/sites/models.pyi

@@ -1,20 +1,22 @@
 from typing import Any, ClassVar
 
 from django.db import models
-from django.http.request import HttpRequest
+from django.http import HttpRequest
 
 SITE_CACHE: Any
 
-class SiteManager(models.Manager[Site]):
-    def get_current(self, request: HttpRequest | None = ...) -> Site: ...
-    def clear_cache(self) -> None: ...
-    def get_by_natural_key(self, domain: str) -> Site: ...
-
 class Site(models.Model):
+    domain: str
+    name: str
+    id: int
+
     objects: ClassVar[SiteManager]
 
-    domain = models.CharField(max_length=100)
-    name = models.CharField(max_length=50)
     def natural_key(self) -> tuple[str]: ...
 
+class SiteManager(models.Manager["Site"]):
+    def get_current(self, request: HttpRequest | None = ...) -> Site: ...
+    def clear_cache(self) -> None: ...
+    def get_by_natural_key(self, domain: str) -> Site: ...
+
 def clear_site_cache(sender: type[Site], **kwargs: Any) -> None: ...

scripts/stubtest/allowlist_todo.txt

@@ -220,10 +220,7 @@ django.contrib.sessions.models.Session.get_next_by_expire_date
 django.contrib.sessions.models.Session.get_previous_by_expire_date
 django.contrib.sessions.models.Session.session_data
 django.contrib.sessions.models.Session.session_key
-django.contrib.sites.models.Site.domain
 django.contrib.sites.models.Site.flatpage_set
-django.contrib.sites.models.Site.id
-django.contrib.sites.models.Site.name
 django.contrib.staticfiles.finders.BaseStorageFinder.storage
 django.contrib.staticfiles.finders.DefaultStorageFinder.storage
 django.contrib.staticfiles.storage.staticfiles_storage