Merge 58450: fix uncollectable reference caused by bsddb.db.DBShelf.append

Adds a DBShelf __repr__ method to not raise an exception when the DB is closed.

diff --git a/Lib/bsddb/dbshelve.py b/Lib/bsddb/dbshelve.py
index c687ab52fafac7d01abc5f551d72475169856a0e..87be3d19f9641f85e98f0c2bc787275577a33f58 100644 (file)
--- a/Lib/bsddb/dbshelve.py
+++ b/Lib/bsddb/dbshelve.py
@@ -86,6 +86,7 @@ class DBShelf(DictMixin):
     """
     def __init__(self, dbenv=None):
         self.db = db.DB(dbenv)
+        self._closed = True
         self.binary = 1
 
 
@@ -128,6 +129,23 @@ class DBShelf(DictMixin):
             return self.db.keys()
 
 
+    def open(self, *args, **kwargs):
+        self.db.open(*args, **kwargs)
+        self._closed = False
+
+
+    def close(self, *args, **kwargs):
+        self.db.close(*args, **kwargs)
+        self._closed = True
+
+
+    def __repr__(self):
+        if self._closed:
+            return '<DBShelf @ 0x%x - closed>' % (id(self))
+        else:
+            return repr(dict(self.iteritems()))
+
+
     def items(self, txn=None):
         if txn != None:
             items = self.db.items(txn)
@@ -156,8 +174,7 @@ class DBShelf(DictMixin):
 
     def append(self, value, txn=None):
         if self.get_type() == db.DB_RECNO:
-            self.append = self.__append
-            return self.append(value, txn=txn)
+            return self.__append(value, txn=txn)
         raise DBShelveError("append() only supported when dbshelve opened with filetype=dbshelve.db.DB_RECNO")