cachetools 7.2.0__tar.gz → 7.2.1__tar.gz

{cachetools-7.2.0 → cachetools-7.2.1}/CHANGELOG.rst

@@ -1,3 +1,14 @@
+v7.2.1 (2026-10-05)
+===================
+
+- Improve error handling for ``RRCache.popitem()`` when the cache is
+  empty.
+
+- Minor style and documentation improvements.
+
+- Update CI environment.
+
+
 v7.2.0 (2026-09-16)
 ===================
 

{cachetools-7.2.0/src/cachetools.egg-info → cachetools-7.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cachetools
-Version: 7.2.0
+Version: 7.2.1
 Summary: Extensible memoizing collections and decorators
 Author-email: Thomas Kemmer <tkemmer@computer.org>
 Maintainer-email: Thomas Kemmer <tkemmer@computer.org>

{cachetools-7.2.0 → cachetools-7.2.1}/docs/index.rst

@@ -756,8 +756,9 @@ this module provides several memoizing function decorators with a
 similar API.  All these decorators wrap a function with a memoizing
 callable that saves up to the `maxsize` most recent calls, using
 different caching strategies.  If `maxsize` is set to :const:`None`,
-the caching strategy is effectively disabled and the cache can grow
-without bound.
+the size limit is disabled and the cache can grow without bound.
+For :func:`ttl_cache`, the time-to-live still applies, so cached
+results expire after `ttl` even without a size limit.
 
 If the optional argument `typed` is set to :const:`True`, function
 arguments of different types will be cached separately.  For example,

{cachetools-7.2.0 → cachetools-7.2.1}/pyproject.toml

@@ -50,9 +50,6 @@ version = {attr = "cachetools.__version__"}
 
 [tool.pyright]
 typeCheckingMode = "standard"
-reportFunctionMemberAccess = "information"
-reportOptionalContextManager = "warning"
-reportOptionalMemberAccess = "warning"
 
 [tool.ruff.lint]
 ignore = ["DTZ005", "UP031"]

{cachetools-7.2.0 → cachetools-7.2.1}/src/cachetools/__init__.py

@@ -12,7 +12,7 @@ __all__ = (
     "cachedmethod",
 )
 
-__version__ = "7.2.0"
+__version__ = "7.2.1"
 
 import collections
 import collections.abc
@@ -52,7 +52,7 @@ class Cache(collections.abc.MutableMapping):
     def __init__(self, maxsize, getsizeof=None):
         if maxsize < 0:
             raise ValueError("maxsize must be non-negative")
-        if getsizeof:
+        if getsizeof is not None:
             self.getsizeof = getsizeof
         if self.getsizeof is not Cache.getsizeof:
             self.__size = {}
@@ -357,12 +357,11 @@ class RRCache(Cache):
 
     def popitem(self):
         """Remove and return a random `(key, value)` pair."""
-        try:
-            key = self.__choice(self.__keys)
-        except IndexError:
+        keys = self.__keys
+        if not keys:
             raise KeyError("%s is empty" % type(self).__name__) from None
-        else:
-            return (key, self.pop(key))
+        key = self.__choice(keys)
+        return (key, self.pop(key))
 
     def clear(self):
         Cache.clear(self)

{cachetools-7.2.0 → cachetools-7.2.1}/src/cachetools/_cached.py

@@ -1,5 +1,7 @@
 """Function decorator helpers."""
 
+# pyright: reportFunctionMemberAccess=false
+
 __all__ = ()
 
 import functools

{cachetools-7.2.0 → cachetools-7.2.1}/src/cachetools/_cachedmethod.py

@@ -1,5 +1,7 @@
 """Method decorator helpers."""
 
+# pyright: reportOptionalContextManager=false, reportOptionalMemberAccess=false
+
 __all__ = ()
 
 import functools

{cachetools-7.2.0 → cachetools-7.2.1/src/cachetools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cachetools
-Version: 7.2.0
+Version: 7.2.1
 Summary: Extensible memoizing collections and decorators
 Author-email: Thomas Kemmer <tkemmer@computer.org>
 Maintainer-email: Thomas Kemmer <tkemmer@computer.org>

{cachetools-7.2.0 → cachetools-7.2.1}/tests/test_rr.py

@@ -86,3 +86,18 @@ class RRCacheTest(unittest.TestCase, CacheTestMixin):
     def test_rr_default_choice(self):
         cache = RRCache[int, int](maxsize=2)
         self.assertIs(cache.choice, random.choice)
+
+    def test_rr_popitem_empty_custom_choice(self):
+        # a custom `choice` function only has to handle non-empty
+        # sequences, so an empty cache has to be detected beforehand
+        for choice in (min, max, lambda seq: next(iter(seq))):
+            cache = RRCache[int, int](maxsize=2, choice=choice)
+
+            with self.assertRaises(KeyError):
+                cache.popitem()
+
+            cache[1] = 1
+            self.assertEqual((1, 1), cache.popitem())
+
+            with self.assertRaises(KeyError):
+                cache.popitem()