fixup

cachetools/ttl.py

@@ -89,10 +89,13 @@ def __iter__(self):
         curr = iter(self.__expire.items())
         # "freeze" time for iterator access
         with self.__timer as time:
-            while True:
-                key, expire = next(curr)
-                if not (expire < time):
-                    yield key
+            try:
+                while True:
+                    key, expire = next(curr)
+                    if not (expire < time):
+                        yield key
+            except StopIteration:
+                pass
 
     def __len__(self):
         time = self.__timer()
@@ -131,13 +134,16 @@ def expire(self, time=None):
         if time is None:
             time = self.__timer()
         cache_delitem = Cache.__delitem__
-        while True:
-            key, expire = next(iter(self.__expire.items()), (None, time))
-            if not (expire < time):
-                break
-            cache_delitem(self, key)
-            del self.__order[key]
-            del self.__expire[key]
+        try:
+            while True:
+                key, expire = next(iter(self.__expire.items()), (None, time))
+                if not (expire < time):
+                    break
+                cache_delitem(self, key)
+                del self.__order[key]
+                del self.__expire[key]
+        except StopIteration:
+            pass
 
     def clear(self):
         with self.__timer as time: