SF #662923

Add support for the iterator and mapping protocols.
For Py2.3, this was done for shelve, dumbdbm and other mapping objects, but
not for bsddb and dbhash which were inadvertently missed.

diff --git a/Doc/lib/libbsddb.tex b/Doc/lib/libbsddb.tex
index 7fb8f76e01b4c8b4f939a9c433e0a14d805ec5cf..719783b63c1bb894d492884feb49111e52546424 100644 (file)
--- a/Doc/lib/libbsddb.tex
+++ b/Doc/lib/libbsddb.tex
@@ -100,8 +100,9 @@ systems which ship with the old Berkeley DB 1.85 database library.  The
 
 \subsection{Hash, BTree and Record Objects \label{bsddb-objects}}
 
-Once instantiated, hash, btree and record objects support the following
-methods:
+Once instantiated, hash, btree and record objects support
+the same methods as dictionaries.  In addition, they support
+the following methods:
 
 \begin{methoddesc}{close}{}
 Close the underlying file.  The object can no longer be accessed.  Since
@@ -177,6 +178,20 @@ Example:
 ('2', '4')
 >>> db.previous() 
 ('1', '1')
+>>> for k, v in db.iteritems():
+...     print k, v
+0 0
+1 1
+2 4
+3 9
+4 16
+5 25
+6 36
+7 49
+8 64
+9 81
+>>> 8 in db
+True
 >>> db.sync()
 0
 \end{verbatim}

diff --git a/Doc/lib/libdbhash.tex b/Doc/lib/libdbhash.tex
index 00a6d080bfdebfb16e1cea3ba1e7c2308ce7ca94..ecaa6c93abb60e31a179aee6a503d4a84cc88324 100644 (file)
--- a/Doc/lib/libdbhash.tex
+++ b/Doc/lib/libdbhash.tex
@@ -51,23 +51,23 @@ This module provides an exception and a function:
 \subsection{Database Objects \label{dbhash-objects}}
 
 The database objects returned by \function{open()} provide the methods 
-common to all the DBM-style databases.  The following methods are
-available in addition to the standard methods.
+common to all the DBM-style databases and mapping objects.  The following
+methods are available in addition to the standard methods.
 
 \begin{methoddesc}[dbhash]{first}{}
-  It's possible to loop over every key in the database using this method 
-  and the \method{next()} method.  The traversal is ordered by
+  It's possible to loop over every key/value pair in the database using
+  this method   and the \method{next()} method.  The traversal is ordered by
   the databases internal hash values, and won't be sorted by the key
   values.  This method returns the starting key.
 \end{methoddesc}
 
 \begin{methoddesc}[dbhash]{last}{}
-  Return the last key in a database traversal.  This may be used to
+  Return the last key/value pair in a database traversal.  This may be used to
   begin a reverse-order traversal; see \method{previous()}.
 \end{methoddesc}
 
 \begin{methoddesc}[dbhash]{next}{}
-  Returns the key next key in a database traversal.  The
+  Returns the key next key/value pair in a database traversal.  The
   following code prints every key in the database \code{db}, without
   having to create a list in memory that contains them all:
 
@@ -79,7 +79,7 @@ for i in xrange(1, len(d)):
 \end{methoddesc}
 
 \begin{methoddesc}[dbhash]{previous}{}
-  Returns the previous key in a forward-traversal of the database.
+  Returns the previous key/value pair in a forward-traversal of the database.
   In conjunction with \method{last()}, this may be used to implement
   a reverse-order traversal.
 \end{methoddesc}

diff --git a/Lib/bsddb/__init__.py b/Lib/bsddb/__init__.py
index 1ec6adc195f22e38a5d1b7abfc3f4febc162e73a..5fc8a38508ee3a1afffaeff4732b369e50b7e1c3 100644 (file)
--- a/Lib/bsddb/__init__.py
+++ b/Lib/bsddb/__init__.py
@@ -52,8 +52,9 @@ error = db.DBError  # So bsddb.error will mean something...
 
 #----------------------------------------------------------------------
 
+import UserDict
 
-class _DBWithCursor:
+class _DBWithCursor(UserDict.DictMixin):
     """
     A simple wrapper around DB that makes it look like the bsddbobject in
     the old module.  It uses a cursor as needed to provide DB traversal.
@@ -144,6 +145,14 @@ class _DBWithCursor:
         self._checkOpen()
         return self.db.sync()
 
+    def __iter__(self):
+        try:
+            yield self.first()[0]
+            next = self.next
+            while 1:
+                yield next()[0]
+        except _bsddb.DBNotFoundError:
+            return
 
 #----------------------------------------------------------------------
 # Compatibility object factory functions

diff --git a/Lib/test/test_bsddb.py b/Lib/test/test_bsddb.py
index aa58ef8ef7f6af0afd389d30a99095082011c8c4..87145fb0ccf058748c88bc724a51fec5229a4dc3 100755 (executable)
--- a/Lib/test/test_bsddb.py
+++ b/Lib/test/test_bsddb.py
@@ -20,12 +20,24 @@ def test(openmethod, what, ondisk=1):
     verify(f.keys() == [])
     if verbose:
         print 'creation...'
-    f['0'] = ''
-    f['a'] = 'Guido'
-    f['b'] = 'van'
-    f['c'] = 'Rossum'
-    f['d'] = 'invented'
-    f['f'] = 'Python'
+    keys = ['0', 'a', 'b', 'c', 'd', 'e', 'f']
+    values = ['', 'Guido', 'van', 'Rossum', 'invented', 'Python']
+    items = zip(keys, values)
+    for k, v in items:
+        f[k] = v
+
+    # test mapping iteration methods
+    from sets import Set
+    def verifyset(s1, s2):
+        verify(Set(s1) == Set(s2))
+    verify(keys, f.keys())
+    verify(values, f.values())
+    verify(items, f.items())
+    verify(keys, f)
+    verify(keys, f.iterkeys())
+    verify(values, f.itervalues())
+    verify(items, f.iteritems())
+
     if verbose:
         print '%s %s %s' % (f['a'], f['b'], f['c'])
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 5cf8d72e89c485557ad817d81241ddc2955f4fe7..6f9855ceee8d9120913c4374577182834c16143f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,10 @@ Extension modules
 Library
 -------
 
+- The bsddb module and dbhash module now support the iterator and
+  mapping protocols which make them more substitutable for dictionaries
+  and shelves.
+
 - The csv module's DictReader and DictWriter classes now accept keyword
   arguments.  This was an omission in the initial implementation.