Ban typing.TypeVar in favor of typing_extensions.TypeVar

django-stubs/contrib/admin/decorators.pyi

@@ -1,11 +1,12 @@
 from collections.abc import Callable, Sequence
-from typing import Any, TypeVar, overload
+from typing import Any, overload
 
 from django.contrib.admin import ModelAdmin
 from django.contrib.admin.sites import AdminSite
 from django.db.models.base import Model
 from django.db.models.expressions import BaseExpression, Combinable
 from django.utils.functional import _StrOrPromise
+from typing_extensions import TypeVar
 
 _ModelAdmin = TypeVar("_ModelAdmin", bound=ModelAdmin[Any])
 _F = TypeVar("_F", bound=Callable[..., Any])

django-stubs/contrib/admin/options.pyi

@@ -1,6 +1,6 @@
 import enum
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
-from typing import Any, ClassVar, Generic, Literal, TypeAlias, TypeVar, cast, type_check_only
+from typing import Any, ClassVar, Generic, Literal, TypeAlias, cast, type_check_only
 
 from django import forms
 from django.contrib.admin.filters import FieldListFilter, ListFilter
@@ -33,7 +33,7 @@ from django.urls.resolvers import URLPattern
 from django.utils.datastructures import _ListOrTuple
 from django.utils.functional import _StrOrPromise
 from django.utils.safestring import SafeString
-from typing_extensions import Self, TypedDict, override
+from typing_extensions import Self, TypedDict, TypeVar, override
 
 IS_POPUP_VAR: str
 TO_FIELD_VAR: str

django-stubs/contrib/admin/sites.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any, TypeAlias, TypeVar
+from typing import Any, TypeAlias
 from weakref import WeakSet
 
 from django.apps.config import AppConfig
@@ -14,6 +14,7 @@ from django.http.response import HttpResponse, HttpResponseBase
 from django.template.response import TemplateResponse
 from django.urls import URLPattern, URLResolver
 from django.utils.functional import LazyObject, _StrOrPromise
+from typing_extensions import TypeVar
 
 all_sites: WeakSet[AdminSite]
 

django-stubs/contrib/admin/utils.pyi

@@ -1,6 +1,6 @@
 from collections import defaultdict
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any, Literal, TypeVar, overload, type_check_only
+from typing import Any, Literal, overload, type_check_only
 from uuid import UUID
 
 from _typeshed import Unused
@@ -16,7 +16,7 @@ from django.forms.forms import BaseForm, Form
 from django.forms.formsets import BaseFormSet
 from django.http.request import HttpRequest
 from django.utils.datastructures import _IndexableCollection
-from typing_extensions import TypedDict, override
+from typing_extensions import TypedDict, TypeVar, override
 
 _T = TypeVar("_T")
 

django-stubs/contrib/admin/views/decorators.pyi

@@ -1,7 +1,8 @@
 from collections.abc import Callable
-from typing import TypeVar, overload
+from typing import overload
 
 from django.utils.functional import _StrOrPromise
+from typing_extensions import TypeVar
 
 _C = TypeVar("_C", bound=Callable)
 

django-stubs/contrib/auth/base_user.pyi

@@ -1,10 +1,11 @@
 from collections.abc import Iterable
-from typing import Any, ClassVar, Literal, TypeVar, overload
+from typing import Any, ClassVar, Literal, overload
 
 from django.db import models
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable
 from django.db.models.fields import BooleanField
+from typing_extensions import TypeVar
 
 _T = TypeVar("_T", bound=Model)
 

django-stubs/contrib/auth/decorators.pyi

@@ -1,9 +1,10 @@
 from collections.abc import Awaitable, Callable, Iterable
-from typing import TypeVar, overload
+from typing import overload
 
 from django.contrib.auth.models import _AnyUser
 from django.http.response import HttpResponseBase
 from django.utils.functional import _StrOrPromise
+from typing_extensions import TypeVar
 
 _VIEW = TypeVar("_VIEW", bound=Callable[..., HttpResponseBase | Awaitable[HttpResponseBase]])
 

django-stubs/contrib/auth/models.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Iterable
-from typing import Any, ClassVar, Literal, TypeAlias, TypeVar
+from typing import Any, ClassVar, Literal, TypeAlias
 
 from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser
 from django.contrib.auth.base_user import BaseUserManager as BaseUserManager
@@ -10,7 +10,7 @@ from django.db.models import QuerySet
 from django.db.models.base import Model
 from django.db.models.manager import EmptyManager
 from django.utils.functional import _StrOrPromise
-from typing_extensions import Never, Self
+from typing_extensions import Never, Self, TypeVar
 
 # This is our "placeholder" type the mypy plugin refines to configured 'AUTH_USER_MODEL'
 # wherever it is used as a type. The most recognised example of this is (probably)

django-stubs/contrib/auth/views.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Mapping
-from typing import Any, TypeVar
+from typing import Any
 
 from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm, PasswordResetForm, SetPasswordForm
 from django.contrib.auth.models import _User, _UserModel
@@ -8,7 +8,7 @@ from django.http.response import HttpResponse, HttpResponseRedirect
 from django.utils.functional import _StrOrPromise
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import FormView
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 UserModel = _UserModel
 _AuthForm = TypeVar("_AuthForm", bound=AuthenticationForm, default=AuthenticationForm)

django-stubs/contrib/contenttypes/forms.pyi

@@ -1,8 +1,8 @@
-from typing import Any, TypeVar
+from typing import Any
 
 from django.db.models import Model
 from django.forms.models import BaseModelFormSet, ModelForm
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 _M = TypeVar("_M", bound=Model)
 _ModelFormT = TypeVar("_ModelFormT", bound=ModelForm)

django-stubs/contrib/contenttypes/prefetch.pyi

@@ -1,8 +1,8 @@
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic
 
 from django.db.models import Model, Prefetch
 from django.db.models.query import QuerySet
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 # The type of the lookup passed to Prefetch(...)
 # This will be specialized to a `LiteralString` in the plugin for further processing and validation

django-stubs/contrib/gis/admin/options.pyi

@@ -1,11 +1,12 @@
-from typing import Any, TypeVar
+from typing import Any
 
 from django.contrib.admin import ModelAdmin
 from django.contrib.gis.forms import OSMWidget
 from django.db.models import Model
 from django.db.models.fields import Field
 from django.forms.fields import Field as FormField
 from django.http.request import HttpRequest
+from typing_extensions import TypeVar
 
 _ModelT = TypeVar("_ModelT", bound=Model)
 

django-stubs/contrib/gis/db/models/fields.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Iterable
-from typing import Any, NamedTuple, TypeVar
+from typing import Any, NamedTuple
 
 from django.contrib.gis import forms
 from django.contrib.gis.geos import (
@@ -18,7 +18,7 @@ from django.db.models.expressions import Combinable, Expression
 from django.db.models.fields import NOT_PROVIDED, Field, _ErrorMessagesMapping
 from django.utils.choices import _Choices
 from django.utils.functional import _StrOrPromise
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 # __set__ value type
 _ST = TypeVar("_ST")

django-stubs/contrib/messages/views.pyi

@@ -1,8 +1,9 @@
-from typing import Generic, TypeVar
+from typing import Generic
 
 from django.forms.forms import BaseForm
 from django.http.response import HttpResponse
 from django.utils.functional import _StrOrPromise
+from typing_extensions import TypeVar
 
 _F = TypeVar("_F", bound=BaseForm)
 

django-stubs/contrib/postgres/fields/array.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Iterable, Sequence
-from typing import Any, ClassVar, TypeVar
+from typing import Any, ClassVar
 
 from _typeshed import Unused
 from django.contrib.postgres.utils import CheckPostgresInstalledMixin
@@ -13,7 +13,7 @@ from django.db.models.fields.mixins import CheckFieldDefaultMixin
 from django.db.models.lookups import Transform
 from django.utils.choices import _Choices
 from django.utils.functional import _StrOrPromise
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 # __set__ value type
 _ST = TypeVar("_ST")

django-stubs/contrib/postgres/fields/ranges.pyi

@@ -1,4 +1,4 @@
-from typing import Any, ClassVar, Literal, TypeVar
+from typing import Any, ClassVar, Literal
 
 from _typeshed import Unused
 from django.contrib.postgres import forms
@@ -8,7 +8,7 @@ from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.models.lookups import PostgresOperatorLookup
 from django.db.models.sql.compiler import SQLCompiler, _AsSqlType
 from psycopg2.extras import DateRange, DateTimeTZRange, NumericRange, Range  # type: ignore[import-untyped]
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 class RangeBoundary(models.Expression):
     lower: str

django-stubs/contrib/sessions/backends/db.pyi

@@ -1,8 +1,9 @@
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic
 
 from django.contrib.sessions.backends.base import SessionBase
 from django.contrib.sessions.base_session import AbstractBaseSession
 from django.utils.functional import cached_property
+from typing_extensions import TypeVar
 
 _ST = TypeVar("_ST", bound=AbstractBaseSession, default=AbstractBaseSession)
 

django-stubs/contrib/sessions/base_session.pyi

@@ -1,9 +1,9 @@
 from datetime import datetime
-from typing import Any, ClassVar, TypeVar
+from typing import Any, ClassVar
 
 from django.contrib.sessions.backends.base import SessionBase
 from django.db import models
-from typing_extensions import Self
+from typing_extensions import Self, TypeVar
 
 _T = TypeVar("_T", bound=AbstractBaseSession)
 

django-stubs/contrib/sessions/models.pyi

@@ -1,6 +1,5 @@
-from typing import TypeVar
-
 from django.contrib.sessions.base_session import AbstractBaseSession, BaseSessionManager
+from typing_extensions import TypeVar
 
 _T = TypeVar("_T", bound=Session)
 

django-stubs/contrib/sitemaps/__init__.pyi

@@ -1,13 +1,13 @@
 from collections.abc import Iterable, Mapping, Sequence
 from datetime import datetime
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic
 
 from django.contrib.sites.models import Site
 from django.contrib.sites.requests import RequestSite
 from django.core.paginator import Paginator
 from django.db.models.base import Model
 from django.db.models.query import QuerySet
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 _ItemT = TypeVar("_ItemT")
 

django-stubs/contrib/sitemaps/views.pyi

@@ -1,10 +1,10 @@
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import TypeVar
 
 from django.contrib.sitemaps import Sitemap
 from django.http.request import HttpRequest
 from django.template.response import TemplateResponse
+from typing_extensions import TypeVar
 
 _C = TypeVar("_C", bound=Callable)
 

django-stubs/contrib/sites/managers.pyi

@@ -1,6 +1,5 @@
-from typing import TypeVar
-
 from django.db import models
+from typing_extensions import TypeVar
 
 _T = TypeVar("_T", bound=models.Model)
 

django-stubs/contrib/syndication/views.pyi

@@ -1,9 +1,10 @@
-from typing import Any, Generic, TypeVar
+from typing import Any, Generic
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.http.request import HttpRequest
 from django.http.response import HttpResponse
 from django.utils.feedgenerator import Enclosure, SyndicationFeed
+from typing_extensions import TypeVar
 
 def add_domain(domain: str, url: str, secure: bool = ...) -> str: ...
 

django-stubs/core/checks/registry.pyi

@@ -1,8 +1,9 @@
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any, Protocol, TypeVar, overload, type_check_only
+from typing import Any, Protocol, overload, type_check_only
 
 from django.apps.config import AppConfig
 from django.core.checks.messages import CheckMessage
+from typing_extensions import TypeVar
 
 class Tags:
     admin: str

django-stubs/core/handlers/asgi.pyi

@@ -1,6 +1,6 @@
 from collections.abc import Awaitable, Callable, Iterator, Mapping, Sequence
 from logging import Logger
-from typing import IO, Any, TypeAlias, TypeVar
+from typing import IO, Any, TypeAlias
 
 from django.core.files import uploadedfile
 from django.core.handlers import base
@@ -9,7 +9,7 @@ from django.http.response import HttpResponseBase
 from django.urls.resolvers import ResolverMatch, URLResolver
 from django.utils.datastructures import MultiValueDict
 from django.utils.functional import cached_property
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 _ReceiveCallback: TypeAlias = Callable[[], Awaitable[Mapping[str, Any]]]
 

django-stubs/core/paginator.pyi

@@ -1,9 +1,9 @@
 from collections.abc import AsyncIterator, Iterable, Iterator, Sequence, Sized
-from typing import ClassVar, Generic, Protocol, TypeVar, overload, type_check_only
+from typing import ClassVar, Generic, Protocol, overload, type_check_only
 
 from django.db.models.fields import _ErrorMessagesDict
 from django.utils.functional import _StrPromise, cached_property
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 class UnorderedObjectListWarning(RuntimeWarning): ...
 class InvalidPage(Exception): ...

django-stubs/db/backends/sqlite3/base.pyi

@@ -2,10 +2,10 @@ from collections.abc import Callable, Iterable
 from datetime import date, datetime
 from sqlite3 import dbapi2 as Database
 from types import ModuleType
-from typing import Any, TypeVar
+from typing import Any
 
 from django.db.backends.base.base import BaseDatabaseWrapper
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 from .client import DatabaseClient
 from .creation import DatabaseCreation

django-stubs/db/models/base.pyi

@@ -1,6 +1,6 @@
 import sys
 from collections.abc import Collection, Iterable, Sequence
-from typing import Any, ClassVar, Final, TypeVar, overload
+from typing import Any, ClassVar, Final, overload
 
 from django.core.checks.messages import CheckMessage
 from django.core.exceptions import MultipleObjectsReturned as BaseMultipleObjectsReturned
@@ -9,7 +9,7 @@ from django.db.models import BaseConstraint, Field, QuerySet
 from django.db.models.manager import Manager
 from django.db.models.options import Options
 from django.db.models.utils import AltersData
-from typing_extensions import Self, override
+from typing_extensions import Self, TypeVar, override
 
 _Self = TypeVar("_Self", bound=Model)
 

django-stubs/db/models/enums.pyi

@@ -1,10 +1,10 @@
 import enum
 import sys
-from typing import Any, Literal, TypeVar, overload, type_check_only
+from typing import Any, Literal, overload, type_check_only
 
 from _typeshed import ConvertibleToInt
 from django.utils.functional import _StrOrPromise
-from typing_extensions import override
+from typing_extensions import TypeVar, override
 
 if sys.version_info >= (3, 11):
     from enum import EnumType, IntEnum, StrEnum