From 7a6c733c3b8ee131d7860ecb0877837e412c2959 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Sun, 13 Jul 2003 17:21:10 +0000 Subject: Make close() identical to __del__() for a dumbdbm database. Make closing idempotent (it used to raise a nuisance exception on the 2nd close attempt). Bugfix candidate? Probably, but arguable. --- Lib/dumbdbm.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Lib/dumbdbm.py') diff --git a/Lib/dumbdbm.py b/Lib/dumbdbm.py index 1475361f2f..7b4ddb02fb 100644 --- a/Lib/dumbdbm.py +++ b/Lib/dumbdbm.py @@ -92,6 +92,9 @@ class _Database(UserDict.DictMixin): # CAUTION: It's vital that _commit() succeed, and _commit() can # be called from __del__(). Therefore we must never reference a # global in this routine. + if self._index is None: + return # nothing to do + try: self._os.unlink(self._bakfile) except self._os.error: @@ -204,12 +207,9 @@ class _Database(UserDict.DictMixin): def close(self): self._commit() - self._index = None - self._datfile = self._dirfile = self._bakfile = None + self._index = self._datfile = self._dirfile = self._bakfile = None - def __del__(self): - if self._index is not None: - self._commit() + __del__ = close -- cgit v1.2.1