Merged revisions 77912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77912 | ezio.melotti | 2010-02-02 17:57:45 +0200 (Tue, 02 Feb 2010) | 1 line

  Fix idioms and a couple of py3k warnings. Patch by Florent Xicluna.
........
diff --git a/Lib/bsddb/dbshelve.py b/Lib/bsddb/dbshelve.py
index 5990df3..d22db91 100644
--- a/Lib/bsddb/dbshelve.py
+++ b/Lib/bsddb/dbshelve.py
@@ -152,7 +152,7 @@
 
 
     def keys(self, txn=None):
-        if txn != None:
+        if txn is not None:
             return self.db.keys(txn)
         else:
             return self.db.keys()
@@ -176,7 +176,7 @@
 
 
     def items(self, txn=None):
-        if txn != None:
+        if txn is not None:
             items = self.db.items(txn)
         else:
             items = self.db.items()
@@ -187,7 +187,7 @@
         return newitems
 
     def values(self, txn=None):
-        if txn != None:
+        if txn is not None:
             values = self.db.values(txn)
         else:
             values = self.db.values()