various fixes

django-stubs/db/models/fields/files.pyi

@@ -3,15 +3,15 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union
 from django.core.checks.messages import Error
 from django.core.files.base import File
 from django.core.files.images import ImageFile
-from django.core.files.storage import FileSystemStorage, Storage
+from django.core.files.storage import FileSystemStorage, Storage, DefaultStorage
 from django.db.models.base import Model
 from django.db.models.fields import Field
-from django.forms.fields import FileField, ImageField
+from django.forms import fields as form_fields
 
 class FieldFile(File):
     instance: Model = ...
-    field: django.db.models.fields.files.FileField = ...
-    storage: django.core.files.storage.FileSystemStorage = ...
+    field: FileField = ...
+    storage: FileSystemStorage = ...
     def __init__(self, instance: Model, field: FileField, name: Optional[str]) -> None: ...
     def __eq__(self, other: Any) -> bool: ...
     def __hash__(self): ...
@@ -31,7 +31,7 @@ class FieldFile(File):
     def close(self) -> None: ...
 
 class FileDescriptor:
-    field: django.db.models.fields.files.FileField = ...
+    field: FileField = ...
     def __init__(self, field: FileField) -> None: ...
     def __get__(self, instance: Optional[Model], cls: Type[Model] = ...) -> Union[FieldFile, FileDescriptor]: ...
     def __set__(self, instance: Model, value: Optional[Union[File, str]]) -> None: ...
@@ -45,48 +45,43 @@ class FileField(Field):
     def __init__(
         self,
         verbose_name: Optional[str] = ...,
-        name: None = ...,
+        name: Optional[str] = ...,
         upload_to: Union[Callable, str] = ...,
         storage: Optional[Storage] = ...,
         **kwargs: Any
     ) -> None: ...
     def check(self, **kwargs: Any) -> List[Error]: ...
-    def deconstruct(self) -> Tuple[Optional[str], str, List[Any], Dict[str, Union[bool, str]]]: ...
+    def deconstruct(self) -> Any: ...
     def get_internal_type(self) -> str: ...
     def get_prep_value(self, value: Union[FieldFile, str]) -> str: ...
     def pre_save(self, model_instance: Model, add: bool) -> FieldFile: ...
     def contribute_to_class(self, cls: Type[Model], name: str, **kwargs: Any) -> None: ...
     def generate_filename(self, instance: Optional[Model], filename: str) -> str: ...
     def save_form_data(self, instance: Model, data: Optional[Union[bool, File, str]]) -> None: ...
-    def formfield(self, **kwargs: Any) -> FileField: ...
+    def formfield(self, **kwargs: Any) -> form_fields.FileField: ...
 
 class ImageFileDescriptor(FileDescriptor):
-    field: django.db.models.fields.files.ImageField
+    field: ImageField
     def __set__(self, instance: Model, value: Optional[str]) -> None: ...
 
 class ImageFieldFile(ImageFile, FieldFile):
-    field: django.db.models.fields.files.ImageField
+    field: ImageField
     instance: Model
     name: Optional[str]
-    storage: django.core.files.storage.DefaultStorage
+    storage: DefaultStorage
     def delete(self, save: bool = ...) -> None: ...
 
 class ImageField(FileField):
-    attr_class: Any = ...
-    descriptor_class: Any = ...
-    description: Any = ...
     def __init__(
         self,
-        verbose_name: None = ...,
-        name: None = ...,
+        verbose_name: Optional[str] = ...,
+        name: Optional[str] = ...,
         width_field: Optional[str] = ...,
         height_field: Optional[str] = ...,
         **kwargs: Any
     ) -> None: ...
     def check(self, **kwargs: Any) -> List[Any]: ...
-    def deconstruct(
-        self
-    ) -> Tuple[Optional[str], str, List[Any], Dict[str, Union[Callable, bool, FileSystemStorage, str]]]: ...
+    def deconstruct(self) -> Any: ...
     def contribute_to_class(self, cls: Type[Model], name: str, **kwargs: Any) -> None: ...
     def update_dimension_fields(self, instance: Model, force: bool = ..., *args: Any, **kwargs: Any) -> None: ...
-    def formfield(self, **kwargs: Any) -> ImageField: ...
+    def formfield(self, **kwargs: Any) -> form_fields.ImageField: ...