[Python-checkins] python/dist/src/Lib dumbdbm.py,1.18,1.19

rhettinger@users.sourceforge.net rhettinger@users.sourceforge.net
Sat, 01 Jun 2002 07:25:43 -0700


Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv11223

Modified Files:
	dumbdbm.py 
Log Message:
SF 563203. Replaced 'has_key()' with 'in'.

Index: dumbdbm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/dumbdbm.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dumbdbm.py	29 May 2002 16:18:41 -0000	1.18
--- dumbdbm.py	1 Jun 2002 14:25:41 -0000	1.19
***************
*** 109,113 ****
          if not type(key) == type('') == type(val):
              raise TypeError, "keys and values must be strings"
!         if not self._index.has_key(key):
              (pos, siz) = self._addval(val)
              self._addkey(key, (pos, siz))
--- 109,113 ----
          if not type(key) == type('') == type(val):
              raise TypeError, "keys and values must be strings"
!         if not key in self._index:
              (pos, siz) = self._addval(val)
              self._addkey(key, (pos, siz))
***************
*** 131,138 ****
  
      def has_key(self, key):
!         return self._index.has_key(key)
  
      def __contains__(self, key):
!         return self._index.has_key(key)
  
      def iterkeys(self):
--- 131,138 ----
  
      def has_key(self, key):
!         return key in self._index
  
      def __contains__(self, key):
!         return key in self._index
  
      def iterkeys(self):