In bsddb, replace UserDict.DictMixin with collections.MutableMapping.

I can't test this directly on my build, so letting the buildbots do it for me.
If it fails, expect a reversion.
This commit is contained in:
Raymond Hettinger 2008-02-04 21:26:27 +00:00
parent 3be449ae36
commit d190f9c45e
3 changed files with 14 additions and 11 deletions

View file

@ -38,12 +38,12 @@ if sys.version_info[:3] >= (2, 3, 0):
HIGHEST_PROTOCOL = pickle.HIGHEST_PROTOCOL
def _dumps(object, protocol):
return pickle.dumps(object, protocol=protocol)
from UserDict import DictMixin
from collections import MutableMapping
else:
HIGHEST_PROTOCOL = None
def _dumps(object, protocol):
return pickle.dumps(object, bin=protocol)
class DictMixin: pass
class MutableMapping: pass
from . import db
@ -90,7 +90,7 @@ def open(filename, flags=db.DB_CREATE, mode=0o660, filetype=db.DB_HASH,
class DBShelveError(db.DBError): pass
class DBShelf(DictMixin):
class DBShelf(MutableMapping):
"""A shelf to hold pickled objects, built upon a bsddb DB object. It
automatically pickles/unpickles data objects going to/from the DB.
"""
@ -141,6 +141,8 @@ class DBShelf(DictMixin):
else:
return self.db.keys()
def __iter__(self):
return iter(self.keys())
def open(self, *args, **kwargs):
self.db.open(*args, **kwargs)