Mild cleanup

Author: bbayles

cdblib/compat.py

@@ -106,10 +106,11 @@ def _cleanup(self):
     def __del__(self):
         self._cleanup()
 
-    def _unique_keys(self, keys):
+    def _unique_keys(self):
+        all_keys = (k for k, v in self._decoded_items())
         seen = set()
         seen_add = seen.add
-        for k in keys:
+        for k in all_keys:
             if k not in seen:
                 seen_add(k)
                 yield k
@@ -130,8 +131,7 @@ def _decoded_items(self):
                 yield tuple(decoded_pair)
 
     def _get_key_iterator(self):
-        all_keys = (k for k, v in self._decoded_items())
-        unique_keys = self._unique_keys(all_keys)
+        unique_keys = self._unique_keys()
         return cycle(chain(unique_keys, repeat(None)))
 
     def each(self):
@@ -191,8 +191,7 @@ def getall(self, k):
     def keys(self):
         """Return a list of the distinct keys stored in the database.
         """
-        all_keys = (k for k, v in self._decoded_items())
-        unique_keys = self._unique_keys(all_keys)
+        unique_keys = self._unique_keys()
         return list(unique_keys)
 
     @property

tests/compat_test.py

@@ -57,7 +57,6 @@ def test_cdbmake_fd(self):
     def test_finish(self):
         self.db.finish()
         self.assertFalse(exists(self.tmp_path))
-        self.db.finish()
 
     def test_get(self):
         reader = self._get_reader()
@@ -128,6 +127,7 @@ class PythonPureCDBTests(CompatTests, unittest.TestCase):
     def test_cdbmake_cleanup(self):
         # Cleanup after close - no exception
         self.db.finish()
+        self.db.finish()
         self.db._cleanup()
 
         # Exception during cleanup - we soldier on