# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2019-12-16 01:51:47
# Node ID 38749d420fbd2620a63e5e7c1cde22d0ffb0626b
# Parent  d4ea298c3ec437a17e4bbdc561f913ad058a2422

cache: keep caching_query cacke_key in unicode ... and always include limit and offset to avoid any ambiguity

diff --git a/kallithea/lib/caching_query.py b/kallithea/lib/caching_query.py
--- a/kallithea/lib/caching_query.py
+++ b/kallithea/lib/caching_query.py
@@ -24,7 +24,7 @@ from sqlalchemy.orm.interfaces import Ma
 from sqlalchemy.orm.query import Query
 from sqlalchemy.sql import visitors
 
-from kallithea.lib.utils2 import safe_str
+from kallithea.lib.utils2 import safe_str, safe_unicode
 
 
 class CachingQuery(Query):
@@ -138,10 +138,10 @@ def _get_cache_parameters(query):
 
     if cache_key is None:
         # cache key - the value arguments from this query's parameters.
-        args = [safe_str(x) for x in _params_from_query(query)]
-        args.extend([k for k in [str(query._limit), str(query._offset)] if k not in ['None', None, u'None']])
-
-        cache_key = " ".join(args)
+        args = _params_from_query(query)
+        args.append(query._limit)
+        args.append(query._offset)
+        cache_key = " ".join(safe_unicode(x) for x in args)
 
     if cache_key is None:
         raise Exception('Cache key cannot be None')