Minor cleanups.

tkem · tkem · commit 73d16025693e · 2026-03-01T21:28:34.000+01:00
diff --git a/src/cachetools/__init__.py b/src/cachetools/__init__.py
@@ -422,11 +422,6 @@ def timer(self):
         """The timer function used by the cache."""
         return self.__timer
 
-    def clear(self):
-        with self.__timer as time:
-            self.expire(time)
-            Cache.clear(self)
-
     def get(self, *args, **kwargs):
         with self.__timer:
             return Cache.get(self, *args, **kwargs)
@@ -439,6 +434,12 @@ def setdefault(self, *args, **kwargs):
         with self.__timer:
             return Cache.setdefault(self, *args, **kwargs)
 
+    def clear(self):
+        # Subclasses must override to also reset their own time-tracking
+        # structures; we do not call expire() here since clear() should
+        # be O(1) regardless of cache contents.
+        Cache.clear(self)
+
 
 class TTLCache(_TimedCache):
     """LRU Cache implementation with per-item time-to-live (TTL) value."""
diff --git a/tests/test_tlru.py b/tests/test_tlru.py
@@ -310,7 +310,7 @@ def test_tlru_clear(self):
         self.assertEqual(0, len(cache))
         self.assertEqual(0, cache.currsize)
 
-        # verify LRU order is reset after clear
+        # verify LRU eviction order is reset after clear
         cache[3] = 3
         cache[4] = 4
         cache[3]  # access 3 to make it most recently used
@@ -320,3 +320,10 @@ def test_tlru_clear(self):
         self.assertIn(3, cache)
         self.assertIn(5, cache)
         self.assertNotIn(4, cache)
+
+        # verify TLRU expiry still works after clear
+        cache[42] = 42
+        cache.timer.tick()
+        cache.timer.tick()
+        cache.timer.tick()  # past TTL
+        self.assertNotIn(42, cache)
diff --git a/tests/test_ttl.py b/tests/test_ttl.py
@@ -226,7 +226,7 @@ def test_ttl_clear(self):
         self.assertEqual(0, len(cache))
         self.assertEqual(0, cache.currsize)
 
-        # verify LRU order is reset after clear
+        # verify LRU eviction order is reset after clear
         cache[3] = 3
         cache[4] = 4
         cache[3]  # access 3 to make it most recently used
@@ -236,3 +236,10 @@ def test_ttl_clear(self):
         self.assertIn(3, cache)
         self.assertIn(5, cache)
         self.assertNotIn(4, cache)
+
+        # verify TTL expiry still works after clear
+        cache[42] = 42
+        cache.timer.tick()
+        cache.timer.tick()
+        cache.timer.tick()  # past TTL
+        self.assertNotIn(42, cache)
