diff options
Diffstat (limited to 'Lib/bsddb/dbobj.py')
| -rw-r--r-- | Lib/bsddb/dbobj.py | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/Lib/bsddb/dbobj.py b/Lib/bsddb/dbobj.py index b74ee72..f6b1d7f 100644 --- a/Lib/bsddb/dbobj.py +++ b/Lib/bsddb/dbobj.py @@ -21,13 +21,24 @@ # added to _bsddb.c. # -import db +import sys +absolute_import = (sys.version_info[0] >= 3) +if absolute_import : + # Because this syntaxis is not valid before Python 2.5 + exec("from . import db") +else : + import db -try: - from UserDict import DictMixin -except ImportError: - # DictMixin is new in Python 2.3 - class DictMixin: pass +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 class DBEnv: def __init__(self, *args, **kwargs): @@ -96,9 +107,8 @@ class DBEnv: def set_get_returns_none(self, *args, **kwargs): return apply(self._cobj.set_get_returns_none, args, kwargs) - if db.version() >= (4,0): - def log_stat(self, *args, **kwargs): - return apply(self._cobj.log_stat, args, kwargs) + def log_stat(self, *args, **kwargs): + return apply(self._cobj.log_stat, args, kwargs) if db.version() >= (4,1): def dbremove(self, *args, **kwargs): @@ -113,7 +123,7 @@ class DBEnv: return apply(self._cobj.lsn_reset, args, kwargs) -class DB(DictMixin): +class DB(MutableMapping): def __init__(self, dbenv, *args, **kwargs): # give it the proper DBEnv C object that its expecting self._cobj = apply(db.DB, (dbenv._cobj,) + args, kwargs) @@ -128,6 +138,10 @@ class DB(DictMixin): def __delitem__(self, arg): del self._cobj[arg] + if sys.version_info[0:2] >= (2, 6) : + def __iter__(self) : + return self._cobj.__iter__() + def append(self, *args, **kwargs): return apply(self._cobj.append, args, kwargs) def associate(self, *args, **kwargs): |