Change dictionary operators to use retry=True semantics

grantjenks · grantjenks · commit e8b9c4a8c1d9 · 2017-08-23T10:23:48.000-07:00
diff --git a/diskcache/fanout.py b/diskcache/fanout.py
@@ -81,21 +81,17 @@ def set(self, key, value, expire=None, read=False, tag=None, retry=False):
                     return False
 
 
+    __set = set
+
+
     def __setitem__(self, key, value):
         """Set `key` and `value` item in cache.
 
         :param key: key for item
         :param value: value for item
 
         """
-        index = self._hash(key) % self._count
-        set_func = self._shards[index].set
-
-        while True:
-            try:
-                return set_func(key, value)
-            except Timeout:
-                continue
+        self.__set(key, value, retry=True)
 
 
     def add(self, key, value, expire=None, read=False, tag=None, retry=False):
@@ -224,6 +220,9 @@ def get(self, key, default=None, read=False, expire_time=False, tag=False,
                     return default
 
 
+    __get = get
+
+
     def __getitem__(self, key):
         """Return corresponding value for `key` from cache.
 
@@ -232,9 +231,11 @@ def __getitem__(self, key):
         :raises KeyError: if key is not found
 
         """
-        value = self.get(key, default=ENOVAL)
+        value = self.__get(key, default=ENOVAL, retry=True)
+
         if value is ENOVAL:
             raise KeyError(key)
+
         return value
 
 
@@ -320,21 +321,20 @@ def delete(self, key, retry=False):
                 return False
 
 
+    __delete = delete
+
+
     def __delitem__(self, key):
         """Delete corresponding item for `key` from cache.
 
         :param key: key for item
         :raises KeyError: if key is not found
 
         """
-        index = self._hash(key) % self._count
-        del_func = self._shards[index].__delitem__
+        deleted = self.__delete(key, retry=True)
 
-        while True:
-            try:
-                return del_func(key)
-            except Timeout:
-                continue
+        if not deleted:
+            raise KeyError(key)
 
 
     memoize = memoize
