fix s.close bug

xlcnd · Oct 20, 2015 · 50c6e09 · 50c6e09
1 parent 7b65113
commit 50c6e09
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/isbnlib/dev/_shelvecache.py b/isbnlib/dev/_shelvecache.py
@@ -58,7 +58,8 @@ def __getitem__(self, key):
             else:
                 return None
         except ValueError:
-            self.new()
+            s = self._sh.open(self.filepath, 'n')
+            self._keys = []
             return None
         finally:
             s.close()
@@ -85,7 +86,8 @@ def __delitem__(self, key):
             del s[key]
             self._keys.remove(key)
         except ValueError:
-            self.new()
+            s = self._sh.open(self.filepath, 'n')
+            self._keys = []
             return
         finally:
             s.close()
@@ -121,7 +123,8 @@ def ts(self, key):
             fmt = '%Y-%m-%d %H:%M:%S'
             return datetime.datetime.fromtimestamp(ts).strftime(fmt)
         except ValueError:
-            self.new()
+            s = self._sh.open(self.filepath, 'n')
+            self._keys = []
             return
         finally:
             s.close()
@@ -135,7 +138,8 @@ def hits(self, key):
             hts = s[key]['hits'] if s[key] else None
             return hts
         except ValueError:
-            self.new()
+            s = self._sh.open(self.filepath, 'n')
+            self._keys = []
             return
         finally:
             s.close()
@@ -149,9 +153,9 @@ def new(self):
 
     def purge(self):
         """Purge the cache."""
+        if len(self.keys()) < self.MAXLEN:
+            return
         try:
-            if len(self.keys()) < self.MAXLEN:
-                return
             s = self._sh.open(self.filepath)
             data = [(k, s[k]['timestamp'], s[k]['hits']) for k in s.keys()]
             data.sort(key=lambda tup: (-tup[2], -tup[1]))