better stubs

django-stubs/core/files/base.pyi

@@ -1,39 +1,38 @@
-# Stubs for django.core.files.base (Python 3.6)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
+from typing import Any, Iterator, Optional, Union
 
 from django.core.files.utils import FileProxyMixin
-from typing import Any, Optional
 
-from typing import Any, Iterator, Optional, Union
 
 class File(FileProxyMixin):
     DEFAULT_CHUNK_SIZE: Any = ...
-    file: Any = ...
-    name: Any = ...
-    mode: Any = ...
+    file: _io.BufferedReader = ...
+    name: str = ...
+    mode: str = ...
     def __init__(self, file: Any, name: Optional[str] = ...) -> None: ...
-    def __str__(self) -> str: ...
-    def __repr__(self) -> str: ...
     def __bool__(self) -> bool: ...
     def __len__(self) -> int: ...
     def size(self) -> int: ...
-    def chunks(self, chunk_size: None = ...) -> Iterator[Union[str, bytes]]: ...
+    def chunks(
+        self, chunk_size: Optional[int] = ...
+    ) -> Iterator[Union[str, bytes]]: ...
     def multiple_chunks(self, chunk_size: Optional[Any] = ...): ...
     def __iter__(self) -> Iterator[Union[str, bytes]]: ...
     def __enter__(self) -> File: ...
     def __exit__(self, exc_type: None, exc_value: None, tb: None) -> None: ...
-    def open(self, mode: Optional[Any] = ...): ...
+    def open(self, mode: Optional[str] = ...) -> File: ...
     def close(self) -> None: ...
 
 class ContentFile(File):
+    file: _io.StringIO
+    name: None
     size: Any = ...
-    def __init__(self, content: Union[str, bytes], name: Optional[str] = ...) -> None: ...
-    def __str__(self): ...
+    def __init__(
+        self, content: Union[str, bytes], name: Optional[str] = ...
+    ) -> None: ...
     def __bool__(self) -> bool: ...
-    def open(self, mode: Optional[Any] = ...): ...
+    def open(self, mode: Optional[str] = ...) -> ContentFile: ...
     def close(self) -> None: ...
-    def write(self, data: Any): ...
+    def write(self, data: str) -> int: ...
 
 def endswith_cr(line: bytes) -> bool: ...
 def endswith_lf(line: Union[str, bytes]) -> bool: ...

django-stubs/core/files/images.pyi

@@ -0,0 +1,19 @@
+from io import BufferedReader, BytesIO
+from typing import Any, Optional, Union
+
+from django.core.files import File
+
+
+class ImageFile(File):
+    file: _io.BufferedReader
+    mode: str
+    name: str
+    @property
+    def width(self) -> int: ...
+    @property
+    def height(self) -> int: ...
+
+def get_image_dimensions(
+    file_or_path: Union[BytesIO, BufferedReader, str, ImageFile],
+    close: bool = ...,
+) -> Any: ...

django-stubs/core/files/locks.pyi

@@ -1,6 +1,17 @@
-from io import BufferedRandom
-from typing import Union
+from ctypes import Structure, Union, c_int64, c_ulong, c_void_p
+from io import BufferedRandom, TextIOWrapper
+from typing import Any, Optional, Union
 
-def _fd(f: Union[BufferedRandom, int]) -> int: ...
-def lock(f: Union[BufferedRandom, int], flags: int) -> bool: ...
-def unlock(f: int) -> bool: ...
+LOCK_SH: int
+LOCK_NB: int
+LOCK_EX: int
+ULONG_PTR = c_int64
+ULONG_PTR = c_ulong
+PVOID = c_void_p
+
+class _OFFSET(Structure): ...
+class _OFFSET_UNION(Union): ...
+class OVERLAPPED(Structure): ...
+
+def lock(f: Union[TextIOWrapper, BufferedRandom, int], flags: int) -> bool: ...
+def unlock(f: Union[BufferedRandom, int]) -> bool: ...

django-stubs/core/files/move.pyi

@@ -1,4 +1,6 @@
-def _samefile(src: str, dst: str) -> bool: ...
+from typing import Any, Optional
+
+
 def file_move_safe(
     old_file_name: str,
     new_file_name: str,

django-stubs/core/files/storage.pyi

@@ -1,11 +1,35 @@
-from io import StringIO
 from datetime import datetime
-from django.core.files.base import File
+from io import StringIO, TextIOWrapper
 from typing import Any, List, Optional, Tuple, Type, Union
 
-def get_storage_class(import_path: Optional[str] = ...) -> Type[Storage]: ...
+from django.core.files.base import File
+from django.utils.functional import LazyObject
 
-class FileSystemStorage:
+
+class Storage:
+    def open(self, name: str, mode: str = ...) -> File: ...
+    def save(
+        self,
+        name: Optional[str],
+        content: Union[TextIOWrapper, StringIO, File],
+        max_length: Optional[int] = ...,
+    ) -> str: ...
+    def get_valid_name(self, name: str) -> str: ...
+    def get_available_name(
+        self, name: str, max_length: Optional[int] = ...
+    ) -> str: ...
+    def generate_filename(self, filename: str) -> str: ...
+    def path(self, name: str) -> Any: ...
+    def delete(self, name: Any) -> None: ...
+    def exists(self, name: Any) -> None: ...
+    def listdir(self, path: Any) -> None: ...
+    def size(self, name: Any) -> None: ...
+    def url(self, name: Any) -> None: ...
+    def get_accessed_time(self, name: Any) -> None: ...
+    def get_created_time(self, name: Any) -> None: ...
+    def get_modified_time(self, name: Any) -> None: ...
+
+class FileSystemStorage(Storage):
     def __init__(
         self,
         location: Optional[str] = ...,
@@ -13,48 +37,21 @@ class FileSystemStorage:
         file_permissions_mode: Optional[int] = ...,
         directory_permissions_mode: Optional[int] = ...,
     ) -> None: ...
-    def _clear_cached_properties(self, setting: str, **kwargs) -> None: ...
-    def _datetime_from_timestamp(self, ts: float) -> datetime: ...
-    def _open(self, name: str, mode: str = ...) -> File: ...
-    def _save(self, name: str, content: File) -> str: ...
-    def _value_or_setting(
-        self, value: Optional[Union[str, int]], setting: Optional[Union[str, int]]
-    ) -> Optional[Union[str, int]]: ...
-    @cached_property
     def base_location(self) -> str: ...
-    @cached_property
+    def location(self) -> str: ...
     def base_url(self) -> str: ...
-    def delete(self, name: str) -> None: ...
-    @cached_property
-    def directory_permissions_mode(self) -> Optional[int]: ...
-    def exists(self, name: str) -> bool: ...
-    @cached_property
     def file_permissions_mode(self) -> Optional[int]: ...
+    def directory_permissions_mode(self) -> Optional[int]: ...
+    def delete(self, name: str) -> None: ...
+    def exists(self, name: str) -> bool: ...
+    def listdir(self, path: str) -> Tuple[List[str], List[str]]: ...
+    def path(self, name: str) -> str: ...
+    def size(self, name: str) -> int: ...
+    def url(self, name: Optional[str]) -> str: ...
     def get_accessed_time(self, name: str) -> datetime: ...
     def get_created_time(self, name: str) -> datetime: ...
     def get_modified_time(self, name: str) -> datetime: ...
-    def listdir(
-        self, path: str
-    ) -> Union[
-        Tuple[List[str], List[Any]],
-        Tuple[List[Any], List[Any]],
-        Tuple[List[Any], List[str]],
-        Tuple[List[str], List[str]],
-    ]: ...
-    @cached_property
-    def location(self) -> str: ...
-    def path(self, name: str) -> str: ...
-    def size(self, name: str) -> int: ...
-    def url(self, name: str) -> str: ...
 
-class Storage:
-    def generate_filename(self, filename: str) -> str: ...
-    def get_available_name(self, name: str, max_length: Optional[int] = ...) -> str: ...
-    def get_valid_name(self, name: str) -> str: ...
-    def open(self, name: str, mode: str = ...) -> File: ...
-    def save(
-        self,
-        name: Optional[str],
-        content: Union[StringIO, File],
-        max_length: Optional[int] = ...,
-    ) -> str: ...
+class DefaultStorage(LazyObject): ...
+
+default_storage: Any

django-stubs/core/files/uploadedfile.pyi

@@ -1,47 +1,43 @@
-# Stubs for django.core.files.uploadedfile (Python 3.6)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
-from django.core.files.base import File
-from typing import Any, Optional
-
 from io import BytesIO, StringIO
 from tempfile import _TemporaryFileWrapper
-from typing import Iterator, Optional, Union
+from typing import Any, Dict, Iterator, Optional, Union
+
+from django.core.files.base import File
+
 
 class UploadedFile(File):
+    file: None
     size: Any = ...
     content_type: Any = ...
     charset: Any = ...
     content_type_extra: Any = ...
     def __init__(
         self,
-        file: Optional[Union[StringIO, _TemporaryFileWrapper, BytesIO]] = ...,
+        file: Optional[Union[_TemporaryFileWrapper, StringIO, BytesIO]] = ...,
         name: str = ...,
         content_type: str = ...,
         size: Optional[int] = ...,
         charset: Optional[str] = ...,
-        content_type_extra: None = ...,
+        content_type_extra: Optional[Dict[str, bytes]] = ...,
     ) -> None: ...
-    def __repr__(self) -> str: ...
-    def _get_name(self) -> str: ...
-    _name: Any = ...
-    def _set_name(self, name: str) -> None: ...
     name: Any = ...
 
 class TemporaryUploadedFile(UploadedFile):
+    file: tempfile._TemporaryFileWrapper
+    mode: str
     def __init__(
         self,
         name: str,
         content_type: str,
         size: int,
-        charset: str,
-        content_type_extra: None = ...,
+        charset: Optional[str],
+        content_type_extra: Optional[Dict[Any, Any]] = ...,
     ) -> None: ...
     def temporary_file_path(self) -> str: ...
     def close(self) -> None: ...
 
 class InMemoryUploadedFile(UploadedFile):
+    file: _io.StringIO
     field_name: Any = ...
     def __init__(
         self,
@@ -51,15 +47,19 @@ class InMemoryUploadedFile(UploadedFile):
         content_type: str,
         size: int,
         charset: Optional[str],
-        content_type_extra: None = ...,
+        content_type_extra: Optional[Dict[str, bytes]] = ...,
     ) -> None: ...
-    def open(self, mode: None = ...) -> InMemoryUploadedFile: ...
+    def open(self, mode: Optional[str] = ...) -> InMemoryUploadedFile: ...
     def chunks(self, chunk_size: None = ...) -> Iterator[Union[str, bytes]]: ...
     def multiple_chunks(self, chunk_size: Optional[Any] = ...): ...
 
 class SimpleUploadedFile(InMemoryUploadedFile):
+    file: _io.BytesIO
     def __init__(
-        self, name: str, content: Optional[bytes], content_type: str = ...
+        self,
+        name: str,
+        content: Optional[Union[str, bytes]],
+        content_type: str = ...,
     ) -> None: ...
     @classmethod
     def from_dict(cls, file_dict: Any): ...

django-stubs/core/files/uploadhandler.pyi

@@ -1,20 +1,16 @@
-# Stubs for django.core.files.uploadhandler (Python 3.6)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
-from typing import Any, Optional
-
 from io import BytesIO
-from django.core.files.uploadedfile import InMemoryUploadedFile, TemporaryUploadedFile
-from django.core.handlers.wsgi import WSGIRequest
 from typing import Any, Dict, Optional, Union
 
+from django.core.files.uploadedfile import (InMemoryUploadedFile,
+                                            TemporaryUploadedFile)
+from django.core.handlers.wsgi import WSGIRequest
+
+
 class UploadFileException(Exception): ...
 
 class StopUpload(UploadFileException):
-    connection_reset: Any = ...
+    connection_reset: bool = ...
     def __init__(self, connection_reset: bool = ...) -> None: ...
-    def __str__(self): ...
 
 class SkipFile(UploadFileException): ...
 class StopFutureHandlers(UploadFileException): ...
@@ -27,10 +23,10 @@ class FileUploadHandler:
     charset: Any = ...
     content_type_extra: Any = ...
     request: Any = ...
-    def __init__(self, request: WSGIRequest = ...) -> None: ...
+    def __init__(self, request: Optional[WSGIRequest] = ...) -> None: ...
     def handle_raw_input(
         self,
-        input_data: WSGIRequest,
+        input_data: Union[WSGIRequest, BytesIO],
         META: Dict[str, Any],
         content_length: int,
         boundary: bytes,
@@ -44,23 +40,35 @@ class FileUploadHandler:
         content_type: str,
         content_length: None,
         charset: None = ...,
-        content_type_extra: Dict[Any, Any] = ...,
+        content_type_extra: Dict[str, bytes] = ...,
     ) -> None: ...
     def receive_data_chunk(self, raw_data: Any, start: Any) -> None: ...
     def file_complete(self, file_size: Any) -> None: ...
     def upload_complete(self) -> None: ...
 
 class TemporaryFileUploadHandler(FileUploadHandler):
+    charset: None
+    content_length: None
+    content_type: None
+    content_type_extra: None
+    file_name: None
+    request: django.core.handlers.wsgi.WSGIRequest
     file: Any = ...
     def new_file(self, *args: Any, **kwargs: Any) -> None: ...
     def receive_data_chunk(self, raw_data: bytes, start: int) -> None: ...
     def file_complete(self, file_size: int) -> TemporaryUploadedFile: ...
 
 class MemoryFileUploadHandler(FileUploadHandler):
+    charset: None
+    content_length: None
+    content_type: None
+    content_type_extra: None
+    file_name: None
+    request: django.core.handlers.wsgi.WSGIRequest
     activated: Any = ...
     def handle_raw_input(
         self,
-        input_data: Union[BytesIO, WSGIRequest],
+        input_data: Union[WSGIRequest, BytesIO],
         META: Dict[str, Any],
         content_length: int,
         boundary: bytes,
@@ -68,7 +76,11 @@ class MemoryFileUploadHandler(FileUploadHandler):
     ) -> None: ...
     file: Any = ...
     def new_file(self, *args: Any, **kwargs: Any) -> None: ...
-    def receive_data_chunk(self, raw_data: bytes, start: int) -> Optional[bytes]: ...
-    def file_complete(self, file_size: int) -> Optional[InMemoryUploadedFile]: ...
+    def receive_data_chunk(
+        self, raw_data: bytes, start: int
+    ) -> Optional[bytes]: ...
+    def file_complete(
+        self, file_size: int
+    ) -> Optional[InMemoryUploadedFile]: ...
 
 def load_handler(path: str, *args: Any, **kwargs: Any) -> FileUploadHandler: ...

django-stubs/core/files/utils.pyi

@@ -1,8 +1,5 @@
-# Stubs for django.core.files.utils (Python 3.6)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
+from typing import Any, Optional
 
-from typing import Any
 
 class FileProxyMixin:
     encoding: Any = ...
@@ -22,6 +19,6 @@ class FileProxyMixin:
     @property
     def closed(self) -> bool: ...
     def readable(self) -> bool: ...
-    def writable(self): ...
-    def seekable(self): ...
+    def writable(self) -> bool: ...
+    def seekable(self) -> bool: ...
     def __iter__(self): ...