better stubs

django-stubs/contrib/messages/storage/__init__.pyi

@@ -1,10 +1,7 @@
-# Stubs for django.contrib.messages.storage (Python 3.6)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
-from typing import Any
+from typing import Any, Optional
 
 from django.contrib.messages.storage.base import BaseStorage
 from django.http.request import HttpRequest
 
+
 def default_storage(request: HttpRequest) -> BaseStorage: ...

django-stubs/contrib/messages/storage/base.pyi

@@ -1,26 +1,35 @@
+from typing import Any, List, Optional, Union
+
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
-from typing import List, Optional, Union
 
-class BaseStorage:
-    def __init__(self, request: HttpRequest, *args, **kwargs) -> None: ...
-    def __len__(self) -> int: ...
-    def _get_level(self) -> int: ...
-    @property
-    def _loaded_messages(self) -> Union[List[Message], List[str]]: ...
-    def _prepare_messages(self, messages: List[Message]) -> None: ...
-    def _set_level(self, value: int = ...) -> None: ...
-    def add(self, level: int, message: str, extra_tags: Optional[str] = ...) -> None: ...
-    def update(self, response: HttpResponseBase) -> None: ...
+LEVEL_TAGS: Any
 
 class Message:
-    def __eq__(self, other: Union[str, Message]) -> bool: ...
+    level: int = ...
+    message: str = ...
+    extra_tags: str = ...
     def __init__(
         self, level: int, message: str, extra_tags: Optional[str] = ...
     ) -> None: ...
-    def __str__(self) -> str: ...
-    def _prepare(self) -> None: ...
-    @property
-    def level_tag(self) -> str: ...
+    def __eq__(self, other: Union[str, Message]) -> bool: ...
     @property
     def tags(self) -> str: ...
+    @property
+    def level_tag(self) -> str: ...
+
+class BaseStorage:
+    request: Any = ...
+    used: bool = ...
+    added_new: bool = ...
+    def __init__(
+        self, request: HttpRequest, *args: Any, **kwargs: Any
+    ) -> None: ...
+    def __len__(self) -> int: ...
+    def __iter__(self): ...
+    def __contains__(self, item: Any): ...
+    def update(self, response: HttpResponseBase) -> Optional[List[Message]]: ...
+    def add(
+        self, level: int, message: str, extra_tags: Optional[str] = ...
+    ) -> None: ...
+    level: Any = ...

django-stubs/contrib/messages/storage/cookie.pyi

@@ -1,51 +1,43 @@
-# Stubs for django.contrib.messages.storage.cookie (Python 3.6)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
 import json
-from django.contrib.messages.storage.base import BaseStorage
-from typing import Any
+from typing import Any, Collection, Dict, List, Optional, Union
+
+from django.contrib.messages.storage.base import BaseStorage, Message
 
-from django.contrib.messages.storage.base import Message
-from django.http.response import HttpResponse
-from typing import Any, List, Optional, Tuple, Union
 
 class MessageEncoder(json.JSONEncoder):
+    allow_nan: bool
+    check_circular: bool
+    ensure_ascii: bool
+    indent: None
+    item_separator: str
+    key_separator: str
+    skipkeys: bool
+    sort_keys: bool
     message_key: str = ...
-    def default(self, obj: Message) -> List[Union[int, str]]: ...
+    def default(self, obj: Message) -> List[Union[str, int]]: ...
 
 class MessageDecoder(json.JSONDecoder):
-    def process_messages(self, obj: Any) -> Any: ...
+    def process_messages(self, obj: Collection) -> Any: ...
     def decode(
         self, s: str, **kwargs: Any
-    ) -> Union[List[Union[Message, str]], List[Message], List[str]]: ...
+    ) -> Union[
+        List[
+            Union[
+                Dict[
+                    str,
+                    Union[Message, List[Union[Message, Dict[str, Message]]]],
+                ],
+                Message,
+            ]
+        ],
+        Message,
+        List[Union[Message, str]],
+    ]: ...
 
 class CookieStorage(BaseStorage):
+    added_new: bool
+    request: django.core.handlers.wsgi.WSGIRequest
+    used: bool
     cookie_name: str = ...
     max_cookie_size: int = ...
     not_finished: str = ...
-    def _get(
-        self, *args: Any, **kwargs: Any
-    ) -> Union[
-        Tuple[None, bool],
-        Tuple[List[Any], bool],
-        Tuple[List[str], bool],
-        Tuple[List[Message], bool],
-    ]: ...
-    def _update_cookie(
-        self, encoded_data: Optional[str], response: HttpResponse
-    ) -> None: ...
-    def _store(
-        self,
-        messages: List[Message],
-        response: HttpResponse,
-        remove_oldest: bool = ...,
-        *args: Any,
-        **kwargs: Any,
-    ) -> List[Message]: ...
-    def _hash(self, value: str) -> str: ...
-    def _encode(
-        self, messages: Union[List[Message], List[str]], encode_empty: bool = ...
-    ) -> Optional[str]: ...
-    used: bool = ...
-    def _decode(self, data: Optional[str]) -> Any: ...

django-stubs/contrib/messages/storage/fallback.pyi

@@ -1,24 +1,12 @@
-# Stubs for django.contrib.messages.storage.fallback (Python 3.6)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
+from typing import Any, Optional
 
 from django.contrib.messages.storage.base import BaseStorage
-from typing import Any
 
-from django.contrib.messages.storage.base import Message
-from django.http.response import HttpResponse
-from typing import Any, List, Tuple, Union
 
 class FallbackStorage(BaseStorage):
+    added_new: bool
+    request: django.core.handlers.wsgi.WSGIRequest
+    used: bool
     storage_classes: Any = ...
     storages: Any = ...
-    _used_storages: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-    def _get(
-        self, *args: Any, **kwargs: Any
-    ) -> Union[
-        Tuple[List[Any], bool], Tuple[List[str], bool], Tuple[List[Message], bool]
-    ]: ...
-    def _store(
-        self, messages: List[Message], response: HttpResponse, *args: Any, **kwargs: Any
-    ) -> List[Any]: ...

django-stubs/contrib/messages/storage/session.pyi

@@ -1,25 +1,20 @@
-# Stubs for django.contrib.messages.storage.session (Python 3.6)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
+from typing import Any, List, Optional, Union
 
-from django.contrib.messages.storage.base import BaseStorage
-from typing import Any
-
-from django.contrib.messages.storage.base import Message
+from django.contrib.messages.storage.base import BaseStorage, Message
 from django.http.request import HttpRequest
-from django.http.response import HttpResponse
-from typing import Any, List, Optional, Tuple, Union
+
 
 class SessionStorage(BaseStorage):
+    added_new: bool
+    request: django.core.handlers.wsgi.WSGIRequest
+    used: bool
     session_key: str = ...
-    def __init__(self, request: HttpRequest, *args: Any, **kwargs: Any) -> None: ...
-    def _get(
-        self, *args: Any, **kwargs: Any
-    ) -> Union[Tuple[None, bool], Tuple[List[str], bool], Tuple[List[Message], bool]]: ...
-    def _store(
-        self, messages: List[Message], response: HttpResponse, *args: Any, **kwargs: Any
-    ) -> List[Any]: ...
-    def serialize_messages(self, messages: Union[List[Message], List[str]]) -> str: ...
+    def __init__(
+        self, request: HttpRequest, *args: Any, **kwargs: Any
+    ) -> None: ...
+    def serialize_messages(
+        self, messages: Union[List[Message], List[str]]
+    ) -> str: ...
     def deserialize_messages(
-        self, data: Optional[str]
-    ) -> Optional[Union[List[Message], List[str]]]: ...
+        self, data: Optional[Union[str, List[Any]]]
+    ) -> Optional[Union[List[str], List[Message]]]: ...