Skip to content

Commit a6e43de

Browse files
committed
make_key and make_pattern return None if key/pattern is None
(cherry picked from commit 409e95d)
1 parent 04acd50 commit a6e43de

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

django_valkey/util.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,23 @@ def glob_escape(s: str) -> str:
3030

3131

3232
def make_key(
33-
key: KeyT, key_func, version: int | None = None, prefix: str | None = None
34-
) -> str:
33+
key: KeyT | None, key_func, version: int | None = None, prefix: str | None = None
34+
) -> CacheKey | None:
35+
if not key:
36+
return key
37+
3538
if isinstance(key, CacheKey):
3639
return key
3740

3841
return CacheKey(key_func(key, prefix, version))
3942

4043

4144
def make_pattern(
42-
pattern: str, key_func, version: int | None = None, prefix: str | None = None
43-
) -> str:
45+
pattern: str | None, key_func, version: int | None = None, prefix: str | None = None
46+
) -> CacheKey | None:
47+
if not pattern:
48+
return pattern
49+
4450
if isinstance(pattern, CacheKey):
4551
return pattern
4652

0 commit comments

Comments
 (0)