Cleanup in __del__

Author: bbayles

cdblib/compat.py

@@ -1,5 +1,3 @@
-import atexit
-
 from itertools import chain, cycle, islice, repeat
 from mmap import mmap, ACCESS_READ
 from os import rename
@@ -27,8 +25,6 @@ def __init__(self, cdb, tmp, encoding='utf-8'):
         self.encoding = encoding
 
         self._temp_obj = open(self.fntmp, 'wb')
-        atexit.register(self._cleanup)
-
         self._writer = Writer(self._temp_obj, strict=True)
         self.numentries = 0
         self._finished = False
@@ -39,6 +35,9 @@ def _cleanup(self):
         except Exception:
             pass
 
+    def __del__(self):
+        self._cleanup()
+
     def add(self, key, data):
         """Store a record in the database.
         """
@@ -90,7 +89,6 @@ def __init__(self, f, encoding='utf-8'):
 
         self._file_obj = open(self._file_path, mode='rb')
         self._mmap_obj = mmap(self._file_obj.fileno(), 0, access=ACCESS_READ)
-        atexit.register(self._cleanup)
         self._reader = Reader(self._mmap_obj)
 
         self._keys = self._get_key_iterator()
@@ -103,6 +101,9 @@ def _cleanup(self):
             except Exception:
                 pass
 
+    def __del__(self):
+        self._cleanup()
+
     def _unique_keys(self, keys):
         seen = set()
         seen_add = seen.add

docs/compat.rst

@@ -143,7 +143,7 @@ The `python-cdb` package accepts integer file descriptors as well as file paths
 in `init()` and `cdbmake()`. This module does not.
 
 The `cdb` objects (returned by the `init()` function) and the `cdbmake` objects
-close their open file objects at interpreter exit.
+close their open file objects when they are garbage collected.
 You may call the `._cleanup()` method on either one to close the objects
 yourself (this method is not avaialble when using the `python-cdb` package).