Remove key_in() from roundup.anypy.dbm_

The key_in() function was just a shim to use the best available option
out of 'd.has_key(key)' and 'key in d'. The 'd.has_key(key)' flavour has
been deprecated in favour of 'key in d' which based on testing has been
available since at least python v2.5 which is the oldest being
supported.

Author: jerrykan

roundup/anypy/dbm_.py

@@ -2,14 +2,6 @@
 # package containing the various implementations. The "wichdb" module's
 # whichdb() function was moved to the new "dbm" module.
 
-import sys
-if sys.version_info[:2] < (2, 6):
-    def key_in(db, key):
-        return db.has_key(key)
-else:
-    def key_in(db, key):
-        return key in db
-
 try:
     # old school first because <3 had a "dbm" module too...
     import anydbm

roundup/backends/back_anydbm.py

@@ -24,7 +24,7 @@
 
 import os, marshal, re, weakref, string, copy, time, shutil, logging
 
-from roundup.anypy.dbm_ import anydbm, whichdb, key_in
+from roundup.anypy.dbm_ import anydbm, whichdb
 
 from roundup import hyperdb, date, password, roundupdb, security, support
 from roundup.backends import locking
@@ -332,7 +332,7 @@ def newid(self, classname):
         """
         # open the ids DB - create if if doesn't exist
         db = self.opendb('_ids', 'c')
-        if key_in(db, classname):
+        if classname in db:
             newid = db[classname] = str(int(db[classname]) + 1)
         else:
             # the count() bit is transitional - older dbs won't start at 1
@@ -409,7 +409,7 @@ def getnode(self, classname, nodeid, db=None, cache=1):
         # get from the database and save in the cache
         if db is None:
             db = self.getclassdb(classname)
-        if not key_in(db, nodeid):
+        if nodeid not in db:
             raise IndexError("no such %s %s"%(classname, nodeid))
 
         # check the uncommitted, destroyed nodes
@@ -521,7 +521,7 @@ def hasnode(self, classname, nodeid, db=None):
         # not in the cache - check the database
         if db is None:
             db = self.getclassdb(classname)
-        return key_in(db, nodeid)
+        return nodeid in db
 
     def countnodes(self, classname, db=None):
         count = 0
@@ -783,7 +783,7 @@ def doSaveJournal(self, classname, nodeid, action, params, creator,
         db = self.getCachedJournalDB(classname)
 
         # now insert the journal entry
-        if key_in(db, nodeid):
+        if nodeid in db:
             # append to existing
             s = db[nodeid]
             l = marshal.loads(s)
@@ -808,12 +808,12 @@ def doSetJournal(self, classname, nodeid, journal):
     def doDestroyNode(self, classname, nodeid):
         # delete from the class database
         db = self.getCachedClassDB(classname)
-        if key_in(db, nodeid):
+        if nodeid in db:
             del db[nodeid]
 
         # delete from the database
         db = self.getCachedJournalDB(classname)
-        if key_in(db, nodeid):
+        if nodeid in db:
             del db[nodeid]
 
     def rollback(self):
@@ -1624,7 +1624,7 @@ def getnodeids(self, db=None, retired=None):
             # remove the uncommitted, destroyed nodes
             if self.classname in self.db.destroyednodes:
                 for nodeid in self.db.destroyednodes[self.classname]:
-                    if key_in(db, nodeid):
+                    if nodeid in db:
                         res.remove(nodeid)
 
             # check retired flag

roundup/backends/sessions_dbm.py

@@ -11,7 +11,8 @@
 from cgi import escape
 from roundup import hyperdb
 from roundup.i18n import _
-from roundup.anypy.dbm_ import anydbm, whichdb, key_in
+from roundup.anypy.dbm_ import anydbm, whichdb
+
 
 class BasicDatabase:
     ''' Provide a nice encapsulation of an anydbm store.
@@ -28,7 +29,7 @@ def __init__(self, db):
     def exists(self, infoid):
         db = self.opendb('c')
         try:
-            return key_in(db, infoid)
+            return infoid in db
         finally:
             db.close()
 
@@ -57,10 +58,11 @@ def cache_db_type(self, path):
         self.__class__._db_type = db_type
 
     _marker = []
+
     def get(self, infoid, value, default=_marker):
         db = self.opendb('c')
         try:
-            if key_in(db, infoid):
+            if infoid in db:
                 values = marshal.loads(db[infoid])
             else:
                 if default != self._marker:
@@ -85,7 +87,7 @@ def getall(self, infoid):
     def set(self, infoid, **newvalues):
         db = self.opendb('c')
         try:
-            if key_in(db, infoid):
+            if infoid in db:
                 values = marshal.loads(db[infoid])
             else:
                 values = {'__timestamp': time.time()}
@@ -104,7 +106,7 @@ def list(self):
     def destroy(self, infoid):
         db = self.opendb('c')
         try:
-            if key_in(db, infoid):
+            if infoid in db:
                 del db[infoid]
         finally:
             db.close()