Minor style and readability improvements.

Author: efkon-tkem

src/cachetools/__init__.py

@@ -154,9 +154,9 @@ def __init__(self, maxsize, getsizeof=None):
 
     def __setitem__(self, key, value, cache_setitem=Cache.__setitem__):
         cache_setitem(self, key, value)
-        try:
+        if key in self.__order:
             self.__order.move_to_end(key)
-        except KeyError:
+        else:
             self.__order[key] = None
 
     def __delitem__(self, key, cache_delitem=Cache.__delitem__):
@@ -204,7 +204,8 @@ def __getitem__(self, key, cache_getitem=Cache.__getitem__):
     def __setitem__(self, key, value, cache_setitem=Cache.__setitem__):
         cache_setitem(self, key, value)
         if key in self.__links:
-            return self.__touch(key)
+            self.__touch(key)
+            return
         root = self.__root
         link = root.next
         if link.count != 1:

src/cachetools/_cached.py

@@ -109,8 +109,11 @@ def cache_clear():
         cache.clear()
         hits = misses = 0
 
+    def cache_info():
+        return info(hits, misses)
+
     wrapper.cache_clear = cache_clear
-    wrapper.cache_info = lambda: info(hits, misses)
+    wrapper.cache_info = cache_info
     return wrapper
 
 

src/cachetools/keys.py

@@ -38,7 +38,7 @@ def hashkey(*args, **kwargs):
     """Return a cache key for the specified hashable arguments."""
 
     if kwargs:
-        return _HashedTuple(args + sum(sorted(kwargs.items()), _kwmark))
+        return _HashedTuple(args + _kwmark + tuple(sorted(kwargs.items())))
     else:
         return _HashedTuple(args)
 
@@ -53,6 +53,7 @@ def typedkey(*args, **kwargs):
 
     key = hashkey(*args, **kwargs)
     key += tuple(type(v) for v in args)
+    # TODO: avoid iterating twice over kwargs
     key += tuple(type(v) for _, v in sorted(kwargs.items()))
     return key