From a82c83f89740ab992612a9c3986deaa0ef49f38d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigurd=20Lj=C3=B8dal?= <544451+ljodal@users.noreply.github.com> Date: Thu, 3 Nov 2022 12:37:51 +0100 Subject: [PATCH] Fix types for sessions (#1173) Co-authored-by: Adam Johnson --- django-stubs/contrib/sessions/backends/base.pyi | 12 ++++++------ django-stubs/contrib/sessions/base_session.pyi | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/django-stubs/contrib/sessions/backends/base.pyi b/django-stubs/contrib/sessions/backends/base.pyi index 7b43763..bce66e9 100644 --- a/django-stubs/contrib/sessions/backends/base.pyi +++ b/django-stubs/contrib/sessions/backends/base.pyi @@ -24,14 +24,14 @@ class SessionBase(Dict[str, Any]): def items(self) -> Any: ... def clear(self) -> None: ... def is_empty(self) -> bool: ... - def _get_session_key(self) -> str: ... - def _set_session_key(self, value: str) -> None: ... + def _get_session_key(self) -> Optional[str]: ... + def _set_session_key(self, value: Optional[str]) -> None: ... @property - def session_key(self) -> str: ... + def session_key(self) -> Optional[str]: ... @property - def _session_key(self) -> str: ... + def _session_key(self) -> Optional[str]: ... @_session_key.setter - def _session_key(self, value: str) -> None: ... + def _session_key(self, value: Optional[str]) -> None: ... 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]]) -> None: ... @@ -41,7 +41,7 @@ class SessionBase(Dict[str, Any]): def exists(self, session_key: str) -> bool: ... def create(self) -> None: ... def save(self, must_create: bool = ...) -> None: ... - def delete(self, session_key: Optional[Any] = ...) -> None: ... + def delete(self, session_key: Optional[str] = ...) -> None: ... def load(self) -> Dict[str, Any]: ... @classmethod def clear_expired(cls) -> None: ... diff --git a/django-stubs/contrib/sessions/base_session.pyi b/django-stubs/contrib/sessions/base_session.pyi index 70430e3..9e337fb 100644 --- a/django-stubs/contrib/sessions/base_session.pyi +++ b/django-stubs/contrib/sessions/base_session.pyi @@ -7,8 +7,8 @@ from django.db import models _T = TypeVar("_T", bound="AbstractBaseSession") class BaseSessionManager(models.Manager[_T]): - def encode(self, session_dict: Dict[str, int]) -> str: ... - def save(self, session_key: str, session_dict: Dict[str, int], expire_date: datetime) -> _T: ... + def encode(self, session_dict: Dict[str, Any]) -> str: ... + def save(self, session_key: str, session_dict: Dict[str, Any], expire_date: datetime) -> _T: ... class AbstractBaseSession(models.Model): expire_date: datetime @@ -17,4 +17,4 @@ class AbstractBaseSession(models.Model): objects: Any = ... @classmethod def get_session_store_class(cls) -> Optional[Type[SessionBase]]: ... - def get_decoded(self) -> Dict[str, int]: ... + def get_decoded(self) -> Dict[str, Any]: ...