Fixup db.models.fields.Field overloads for pyright 1.1.378 (#265)

Fix for #264
sbdchd · Sep 2, 2024 · 7f9bd0d · 7f9bd0d
1 parent 7eec985
commit 7f9bd0d
Show file tree

Hide file tree

Showing 27 changed files with 223 additions and 141 deletions.
diff --git a/django-stubs/contrib/admin/templatetags/base.pyi b/django-stubs/contrib/admin/templatetags/base.pyi
@@ -10,7 +10,7 @@ class InclusionAdminNode(InclusionNode):
     args: list[Any]
     func: Callable[..., Any]
     kwargs: dict[Any, Any]
-    takes_context: bool
+    takes_context: bool  # pyright: ignore[reportIncompatibleVariableOverride]
     template_name: str = ...
     def __init__(
         self,

diff --git a/django-stubs/contrib/contenttypes/fields.pyi b/django-stubs/contrib/contenttypes/fields.pyi
@@ -67,7 +67,7 @@ class GenericForeignKey(FieldCacheMixin):
     def __set__(self, instance: Model, value: Any | None) -> None: ...
 
 class GenericRel(ForeignObjectRel):
-    field: GenericRelation
+    field: GenericRelation  # pyright: ignore[reportIncompatibleVariableOverride]
     def __init__(
         self,
         field: GenericRelation,

diff --git a/django-stubs/contrib/contenttypes/models.pyi b/django-stubs/contrib/contenttypes/models.pyi
@@ -22,7 +22,9 @@ class ContentType(models.Model):
     id: int
     app_label: models.CharField[Any] = ...
     model: models.CharField[Any] = ...
-    objects: ClassVar[ContentTypeManager] = ...
+    objects: ClassVar[  # pyright: ignore[reportIncompatibleVariableOverride]
+        ContentTypeManager
+    ] = ...
     permission_set: Manager[Permission]
     @property
     def name(self) -> str: ...

diff --git a/django-stubs/contrib/postgres/fields/array.pyi b/django-stubs/contrib/postgres/fields/array.pyi
@@ -17,17 +17,18 @@ class ArrayField(CheckFieldDefaultMixin, Generic[_V], Field[_V | Combinable, _V]
     from_db_value: Any = ...
     base_field: Field[_V, _V] = ...
     @overload
-    def __new__(  # type: ignore [misc]
+    def __new__(
         cls,
         base_field: Field[Any, _V],
         size: int | None = ...,
         verbose_name: str | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[False] = ...,
+        null: Literal[False] = False,
         db_index: bool = ...,
         default: list[_V] | Callable[[], list[_V]] | None = ...,
         editable: bool = ...,
@@ -51,12 +52,13 @@ class ArrayField(CheckFieldDefaultMixin, Generic[_V], Field[_V | Combinable, _V]
         base_field: Field[Any, _V],
         size: int | None = ...,
         verbose_name: str | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[True] = ...,
+        null: Literal[True],
         db_index: bool = ...,
         default: list[_V] | Callable[[], list[_V]] | None = ...,
         editable: bool = ...,

diff --git a/django-stubs/contrib/postgres/fields/citext.pyi b/django-stubs/contrib/postgres/fields/citext.pyi
@@ -20,12 +20,13 @@ class CICharField(CIText, CharField[_C]):
     def __init__(
         self: CICharField[str],
         verbose_name: str | bytes | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[False] = ...,
+        null: Literal[False] = False,
         db_index: bool = ...,
         default: Any = ...,
         editable: bool = ...,
@@ -45,12 +46,13 @@ class CICharField(CIText, CharField[_C]):
     def __init__(
         self: CICharField[str | None],
         verbose_name: str | bytes | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[True] = ...,
+        null: Literal[True],
         db_index: bool = ...,
         default: Any = ...,
         editable: bool = ...,
@@ -74,12 +76,13 @@ class CIEmailField(CIText, EmailField[_C]):
     def __init__(
         self: CIEmailField[str],
         verbose_name: str | bytes | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[False] = ...,
+        null: Literal[False] = False,
         db_index: bool = ...,
         default: Any = ...,
         editable: bool = ...,
@@ -99,12 +102,13 @@ class CIEmailField(CIText, EmailField[_C]):
     def __init__(
         self: CIEmailField[str | None],
         verbose_name: str | bytes | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[True] = ...,
+        null: Literal[True],
         db_index: bool = ...,
         default: Any = ...,
         editable: bool = ...,
@@ -128,12 +132,13 @@ class CITextField(CIText, TextField[_C]):
     def __init__(
         self: CITextField[str],
         verbose_name: str | bytes | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[False] = ...,
+        null: Literal[False] = False,
         db_index: bool = ...,
         default: Any = ...,
         editable: bool = ...,
@@ -153,12 +158,13 @@ class CITextField(CIText, TextField[_C]):
     def __init__(
         self: CITextField[str | None],
         verbose_name: str | bytes | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[True] = ...,
+        null: Literal[True],
         db_index: bool = ...,
         default: Any = ...,
         editable: bool = ...,

diff --git a/django-stubs/contrib/postgres/fields/hstore.pyi b/django-stubs/contrib/postgres/fields/hstore.pyi
@@ -19,12 +19,13 @@ class HStoreField(Generic[_T], CheckFieldDefaultMixin, Field[Any, Any]):
     def __init__(
         self: HStoreField[dict[str, str | None]],
         verbose_name: str | bytes | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[False] = ...,
+        null: Literal[False] = False,
         db_index: bool = ...,
         default: Any = ...,
         editable: bool = ...,
@@ -44,12 +45,13 @@ class HStoreField(Generic[_T], CheckFieldDefaultMixin, Field[Any, Any]):
     def __init__(
         self: HStoreField[dict[str, str | None] | None],
         verbose_name: str | bytes | None = ...,
+        *,
         name: str | None = ...,
         primary_key: bool = ...,
         max_length: int | None = ...,
         unique: bool = ...,
         blank: bool = ...,
-        null: Literal[True] = ...,
+        null: Literal[True],
         db_index: bool = ...,
         default: Any = ...,
         editable: bool = ...,

diff --git a/django-stubs/core/files/base.pyi b/django-stubs/core/files/base.pyi
@@ -31,7 +31,7 @@ class File(FileProxyMixin, IO[Any]):
     def close(self) -> None: ...
 
 class ContentFile(File):
-    file: StringIO
+    file: StringIO  # pyright: ignore[reportIncompatibleVariableOverride]
     size: Any = ...
     def __init__(self, content: bytes | str, name: str | None = ...) -> None: ...
     def write(self, data: str) -> int: ...  # type: ignore[override]

diff --git a/django-stubs/core/mail/message.pyi b/django-stubs/core/mail/message.pyi
@@ -26,25 +26,25 @@ class MIMEMixin: ...
 
 class SafeMIMEMessage(MIMEMixin, MIMEMessage):
     defects: list[Any]
-    epilogue: None
+    epilogue: None  # pyright: ignore[reportIncompatibleVariableOverride]
     policy: Policy  # type: ignore [no-any-unimported]
-    preamble: None
+    preamble: None  # pyright: ignore[reportIncompatibleVariableOverride]
 
 class SafeMIMEText(MIMEMixin, MIMEText):
     defects: list[Any]
-    epilogue: None
+    epilogue: None  # pyright: ignore[reportIncompatibleVariableOverride]
     policy: Policy  # type: ignore [no-any-unimported]
-    preamble: None
+    preamble: None  # pyright: ignore[reportIncompatibleVariableOverride]
     encoding: str = ...
     def __init__(
         self, _text: str, _subtype: str = ..., _charset: str = ...
     ) -> None: ...
 
 class SafeMIMEMultipart(MIMEMixin, MIMEMultipart):
     defects: list[Any]
-    epilogue: None
+    epilogue: None  # pyright: ignore[reportIncompatibleVariableOverride]
     policy: Policy  # type: ignore [no-any-unimported]
-    preamble: None
+    preamble: None  # pyright: ignore[reportIncompatibleVariableOverride]
     encoding: str = ...
     def __init__(
         self,

diff --git a/django-stubs/core/serializers/json.pyi b/django-stubs/core/serializers/json.pyi
@@ -12,6 +12,6 @@ class DjangoJSONEncoder(json.JSONEncoder):
     allow_nan: bool
     check_circular: bool
     ensure_ascii: bool
-    indent: int
+    indent: int  # pyright: ignore[reportIncompatibleVariableOverride]
     skipkeys: bool
     sort_keys: bool
diff --git a/django-stubs/core/servers/basehttp.pyi b/django-stubs/core/servers/basehttp.pyi
@@ -28,8 +28,8 @@ class WSGIRequestHandler(simple_server.WSGIRequestHandler):
     close_connection: bool
     connection: WSGIRequest
     request: WSGIRequest
-    rfile: BytesIO
-    wfile: BytesIO
+    rfile: BytesIO  # pyright: ignore[reportIncompatibleVariableOverride]
+    wfile: BytesIO  # pyright: ignore[reportIncompatibleVariableOverride]
     protocol_version: str = ...
     def address_string(self) -> str: ...
     def log_message(self, format: str, *args: Any) -> None: ...