Mercurial > p > roundup > code
diff roundup/backends/sessions_dbm.py @ 5011:d5da643b3d25
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 | John Kristensen <john@jerrykan.com> |
|---|---|
| date | Fri, 13 Feb 2015 00:20:43 +1100 |
| parents | 033a550812fc |
| children | 0b154486ed38 |
line wrap: on
line diff
--- a/roundup/backends/sessions_dbm.py Wed Jan 06 16:02:34 2016 +1100 +++ b/roundup/backends/sessions_dbm.py Fri Feb 13 00:20:43 2015 +1100 @@ -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 exists(self, infoid): db = self.opendb('c') try: - return key_in(db, infoid) + return infoid in db finally: db.close() @@ -57,10 +58,11 @@ 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 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 destroy(self, infoid): db = self.opendb('c') try: - if key_in(db, infoid): + if infoid in db: del db[infoid] finally: db.close()
