Issue 7975: in python 2.6 bsddb.dbshelve switched from DictMixin to
MutableMapping, and thereby lost functionality because the replacement
functionality was implemented incorrectly or incompletely). Since bsddb
isn't in py3k, this patch just goes back to using DictMixin in order to
correct the regression.
diff --git a/Lib/bsddb/dbshelve.py b/Lib/bsddb/dbshelve.py
index 1706ca8..7c875b4 100644
--- a/Lib/bsddb/dbshelve.py
+++ b/Lib/bsddb/dbshelve.py
@@ -59,16 +59,11 @@
return cPickle.dumps(object, bin=protocol)
-if sys.version_info[0:2] <= (2, 5) :
- try:
- from UserDict import DictMixin
- except ImportError:
- # DictMixin is new in Python 2.3
- class DictMixin: pass
- MutableMapping = DictMixin
-else :
- import collections
- MutableMapping = collections.MutableMapping
+try:
+ from UserDict import DictMixin
+except ImportError:
+ # DictMixin is new in Python 2.3
+ class DictMixin: pass
#------------------------------------------------------------------------
@@ -111,7 +106,7 @@
class DBShelveError(db.DBError): pass
-class DBShelf(MutableMapping):
+class DBShelf(DictMixin):
"""A shelf to hold pickled objects, built upon a bsddb DB object. It
automatically pickles/unpickles data objects going to/from the DB.
"""
@@ -162,10 +157,6 @@
else:
return self.db.keys()
- if sys.version_info[0:2] >= (2, 6) :
- def __iter__(self) :
- return self.db.__iter__()
-
def open(self, *args, **kwargs):
self.db.open(*args, **kwargs)
diff --git a/Misc/NEWS b/Misc/NEWS
index 5dc3a7b..ee77d5d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -30,6 +30,8 @@
Library
-------
+- Issue #7975: correct regression in dict methods supported by bsddb.dbshelve.
+
- Issue #7959: ctypes callback functions are now registered correctly
with the cylce garbage collector.