Skip to content

revert sentry BaseCache method modifications #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asottile-sentry merged 2 commits into from
Sep 15, 2025
Merged

revert sentry BaseCache method modifications #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aafdb7a
Revert "ref: remove incr_version / decr_version (#15)"
asottile-sentry Sep 15, 2025
469a896
Revert "cache's version can be Any (#14)"
asottile-sentry Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 31 additions & 27 deletions django-stubs/core/cache/backends/base.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,46 +20,50 @@ class BaseCache:
_max_entries: int
_cull_frequency: int
key_prefix: str
version: Any
version: int
key_func: Callable
def __init__(self, params: dict[str, Any]) -> None: ...
def get_backend_timeout(self, timeout: float | None = ...) -> float | None: ...
def make_key(self, key: Any, version: Any | None = None) -> str: ...
def make_key(self, key: Any, version: int | None = None) -> str: ...
def validate_key(self, key: Any) -> None: ...
def make_and_validate_key(self, key: Any, version: Any | None = None) -> str: ...
def add(self, key: Any, value: Any, timeout: float | None = ..., version: Any | None = None) -> bool: ...
async def aadd(self, key: Any, value: Any, timeout: float | None = ..., version: Any | None = None) -> bool: ...
def get(self, key: Any, default: Any | None = None, version: Any | None = None) -> Any: ...
async def aget(self, key: Any, default: Any | None = None, version: Any | None = None) -> Any: ...
def set(self, key: Any, value: Any, timeout: float | None = ..., version: Any | None = None) -> None: ...
async def aset(self, key: Any, value: Any, timeout: float | None = ..., version: Any | None = None) -> None: ...
def touch(self, key: Any, timeout: float | None = ..., version: Any | None = None) -> bool: ...
async def atouch(self, key: Any, timeout: float | None = ..., version: Any | None = None) -> bool: ...
def delete(self, key: Any, version: Any | None = None) -> bool: ...
async def adelete(self, key: Any, version: Any | None = None) -> bool: ...
def get_many(self, keys: Iterable[Any], version: Any | None = None) -> dict[Any, Any]: ...
async def aget_many(self, keys: Iterable[Any], version: Any | None = None) -> dict[Any, Any]: ...
def make_and_validate_key(self, key: Any, version: int | None = None) -> str: ...
def add(self, key: Any, value: Any, timeout: float | None = ..., version: int | None = None) -> bool: ...
async def aadd(self, key: Any, value: Any, timeout: float | None = ..., version: int | None = None) -> bool: ...
def get(self, key: Any, default: Any | None = None, version: int | None = None) -> Any: ...
async def aget(self, key: Any, default: Any | None = None, version: int | None = None) -> Any: ...
def set(self, key: Any, value: Any, timeout: float | None = ..., version: int | None = None) -> None: ...
async def aset(self, key: Any, value: Any, timeout: float | None = ..., version: int | None = None) -> None: ...
def touch(self, key: Any, timeout: float | None = ..., version: int | None = None) -> bool: ...
async def atouch(self, key: Any, timeout: float | None = ..., version: int | None = None) -> bool: ...
def delete(self, key: Any, version: int | None = None) -> bool: ...
async def adelete(self, key: Any, version: int | None = None) -> bool: ...
def get_many(self, keys: Iterable[Any], version: int | None = None) -> dict[Any, Any]: ...
async def aget_many(self, keys: Iterable[Any], version: int | None = None) -> dict[Any, Any]: ...
def get_or_set(
self, key: Any, default: Any | None, timeout: float | None = ..., version: Any | None = None
self, key: Any, default: Any | None, timeout: float | None = ..., version: int | None = None
) -> Any | None: ...
async def aget_or_set(
self, key: Any, default: Any | None, timeout: float | None = ..., version: Any | None = None
self, key: Any, default: Any | None, timeout: float | None = ..., version: int | None = None
) -> Any | None: ...
def has_key(self, key: Any, version: Any | None = None) -> bool: ...
async def ahas_key(self, key: Any, version: Any | None = None) -> bool: ...
def incr(self, key: Any, delta: int = 1, version: Any | None = None) -> int: ...
async def aincr(self, key: Any, delta: int = 1, version: Any | None = None) -> int: ...
def decr(self, key: Any, delta: int = 1, version: Any | None = None) -> int: ...
async def adecr(self, key: Any, delta: int = 1, version: Any | None = None) -> int: ...
def has_key(self, key: Any, version: int | None = None) -> bool: ...
async def ahas_key(self, key: Any, version: int | None = None) -> bool: ...
def incr(self, key: Any, delta: int = 1, version: int | None = None) -> int: ...
async def aincr(self, key: Any, delta: int = 1, version: int | None = None) -> int: ...
def decr(self, key: Any, delta: int = 1, version: int | None = None) -> int: ...
async def adecr(self, key: Any, delta: int = 1, version: int | None = None) -> int: ...
def __contains__(self, key: Any) -> bool: ...
def set_many(self, data: dict[Any, Any], timeout: float | None = ..., version: Any | None = None) -> list[Any]: ...
def set_many(self, data: dict[Any, Any], timeout: float | None = ..., version: int | None = None) -> list[Any]: ...
async def aset_many(
self, data: dict[Any, Any], timeout: float | None = ..., version: Any | None = None
self, data: dict[Any, Any], timeout: float | None = ..., version: int | None = None
) -> list[Any]: ...
def delete_many(self, keys: Iterable[Any], version: Any | None = None) -> None: ...
async def adelete_many(self, keys: Iterable[Any], version: Any | None = None) -> None: ...
def delete_many(self, keys: Iterable[Any], version: int | None = None) -> None: ...
async def adelete_many(self, keys: Iterable[Any], version: int | None = None) -> None: ...
def clear(self) -> None: ...
async def aclear(self) -> None: ...
def incr_version(self, key: Any, delta: int = 1, version: int | None = None) -> int: ...
async def aincr_version(self, key: Any, delta: int = 1, version: int | None = None) -> int: ...
def decr_version(self, key: Any, delta: int = 1, version: int | None = None) -> int: ...
async def adecr_version(self, key: Any, delta: int = 1, version: int | None = None) -> int: ...
def close(self, **kwargs: Any) -> None: ...
async def aclose(self, **kwargs: Any) -> None: ...

Expand Down
10 changes: 0 additions & 10 deletions scripts/stubtest/allowlist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,6 @@ django.contrib.auth.views.UserModel
django.contrib.sessions.backends.base.SessionBase.get
django.contrib.sessions.backends.base.SessionBase.setdefault

# sentry: we remove these methods because they are unsafe for our usage
django.core.cache.BaseCache.adecr_version
django.core.cache.BaseCache.aincr_version
django.core.cache.BaseCache.decr_version
django.core.cache.BaseCache.incr_version
django.core.cache.backends.base.BaseCache.adecr_version
django.core.cache.backends.base.BaseCache.aincr_version
django.core.cache.backends.base.BaseCache.decr_version
django.core.cache.backends.base.BaseCache.incr_version

# Limited stubtest support for enums (https://github.com/python/mypy/issues/16806)
django.db.migrations.operations.base.OperationCategory.__new__

Expand Down
Loading