third iteration of stubs

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

@@ -16,25 +16,34 @@ class SessionBase:
     serializer: Any = ...
     def __init__(self, session_key: Optional[str] = ...) -> None: ...
     def __contains__(self, key: str) -> bool: ...
-    def __getitem__(self, key: str) -> Union[str, Model, int]: ...
+    def __getitem__(self, key: str) -> Union[Model, int, str]: ...
     def __setitem__(
-        self, key: str, value: Union[str, datetime, Model, int]
+        self, key: str, value: Union[datetime, Model, int, str]
     ) -> None: ...
     def __delitem__(self, key: str) -> None: ...
     def get(
         self, key: str, default: Optional[str] = ...
-    ) -> Optional[Union[str, int, datetime]]: ...
-    def pop(self, key: str, default: Any = ...) -> Union[str, int]: ...
+    ) -> Optional[Union[datetime, int, str]]: ...
+    def pop(self, key: str, default: Any = ...) -> Union[int, str]: ...
     def setdefault(self, key: str, value: str) -> str: ...
     def set_test_cookie(self) -> None: ...
     def test_cookie_worked(self) -> bool: ...
     def delete_test_cookie(self) -> None: ...
     def encode(
-        self, session_dict: Dict[str, Union[str, int, Model, datetime]]
+        self,
+        session_dict: Union[
+            Dict[str, Union[datetime, str]],
+            Dict[str, Union[int, str]],
+            Dict[str, Model],
+        ],
     ) -> str: ...
     def decode(
-        self, session_data: Union[str, bytes]
-    ) -> Dict[str, Union[str, int, Model, datetime]]: ...
+        self, session_data: Union[bytes, str]
+    ) -> Union[
+        Dict[str, Union[datetime, str]],
+        Dict[str, Union[int, str]],
+        Dict[str, Model],
+    ]: ...
     def update(self, dict_: Dict[str, int]) -> None: ...
     def has_key(self, key: Any): ...
     def keys(self): ...
@@ -46,7 +55,7 @@ class SessionBase:
     def get_expiry_age(self, **kwargs: Any) -> int: ...
     def get_expiry_date(self, **kwargs: Any) -> datetime: ...
     def set_expiry(
-        self, value: Optional[Union[datetime, int, timedelta]]
+        self, value: Optional[Union[datetime, timedelta, int]]
     ) -> None: ...
     def get_expire_at_browser_close(self) -> bool: ...
     def flush(self) -> None: ...

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

@@ -14,12 +14,19 @@ class SessionStore(SessionBase):
     @classmethod
     def get_model_class(cls) -> Type[Session]: ...
     def model(self) -> Type[AbstractBaseSession]: ...
-    def load(self) -> Dict[str, Union[Model, str, int]]: ...
+    def load(
+        self
+    ) -> Union[Dict[str, Model], Dict[str, int], Dict[str, str]]: ...
     def exists(self, session_key: Optional[str]) -> bool: ...
     modified: bool = ...
     def create(self) -> None: ...
     def create_model_instance(
-        self, data: Dict[str, Union[int, str, Model, datetime]]
+        self,
+        data: Union[
+            Dict[str, Union[datetime, str]],
+            Dict[str, Union[int, str]],
+            Dict[str, Model],
+        ],
     ) -> AbstractBaseSession: ...
     def save(self, must_create: bool = ...) -> None: ...
     def delete(self, session_key: Optional[str] = ...) -> None: ...

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

@@ -9,7 +9,7 @@ class SessionStore(SessionBase):
     storage_path: str = ...
     file_prefix: str = ...
     def __init__(self, session_key: Optional[str] = ...) -> None: ...
-    def load(self) -> Dict[str, Union[str, int]]: ...
+    def load(self) -> Dict[str, Union[int, str]]: ...
     modified: bool = ...
     def create(self) -> None: ...
     def save(self, must_create: bool = ...) -> None: ...

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

@@ -7,7 +7,7 @@ from django.contrib.sessions.backends.base import SessionBase
 class SessionStore(SessionBase):
     accessed: bool
     serializer: Type[django.core.signing.JSONSerializer]
-    def load(self) -> Dict[str, Union[str, datetime]]: ...
+    def load(self) -> Dict[str, Union[datetime, str]]: ...
     modified: bool = ...
     def create(self) -> None: ...
     def save(self, must_create: bool = ...) -> None: ...

django-stubs/contrib/sessions/serializers.pyi

@@ -6,7 +6,11 @@ from django.db.models.base import Model
 
 
 class PickleSerializer:
-    def dumps(self, obj: Dict[str, Union[Model, str, datetime]]) -> bytes: ...
-    def loads(self, data: bytes) -> Dict[str, Union[Model, str, datetime]]: ...
+    def dumps(
+        self, obj: Union[Dict[str, Union[datetime, str]], Dict[str, Model]]
+    ) -> bytes: ...
+    def loads(
+        self, data: bytes
+    ) -> Union[Dict[str, Union[datetime, str]], Dict[str, Model]]: ...
 
 JSONSerializer = BaseJSONSerializer