# HG changeset patch # User RhodeCode Admin # Date 2022-10-26 08:38:13 # Node ID 3a95950837e2164fa0fe1365eb9f89df7100194b # Parent e4831d789bf16505e5c0aef4205aadce6da0ece6 caches: fixed unicode errors on non-ascii cache keys diff --git a/rhodecode/lib/rc_cache/backends.py b/rhodecode/lib/rc_cache/backends.py --- a/rhodecode/lib/rc_cache/backends.py +++ b/rhodecode/lib/rc_cache/backends.py @@ -36,7 +36,7 @@ from dogpile.cache.util import memoized_ from pyramid.settings import asbool from rhodecode.lib.memory_lru_dict import LRUDict, LRUDictDebug -from rhodecode.lib.utils import safe_str +from rhodecode.lib.utils import safe_str, safe_unicode _default_max_size = 1024 @@ -300,7 +300,7 @@ class BaseRedisBackend(redis_backend.Red def get_mutex(self, key): if self.distributed_lock: - lock_key = redis_backend.u('_lock_{0}').format(safe_str(key)) + lock_key = redis_backend.u(u'_lock_{0}'.format(safe_unicode(key))) return get_mutex_lock(self.client, lock_key, self._lock_timeout, auto_renewal=self._lock_auto_renewal) else: