[Python-checkins] CVS: python/dist/src/Lib UserDict.py,1.13,1.14

Martin v. L?wis loewis@users.sourceforge.net
Sun, 17 Jun 2001 18:09:43 -0700


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

Modified Files:
	UserDict.py 
Log Message:
Patch #413171: Implement get, setdefault, update in terms of
has_key, __getitem__, and __setitem__.


Index: UserDict.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/UserDict.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** UserDict.py	2001/05/03 04:54:41	1.13
--- UserDict.py	2001/06/18 01:09:41	1.14
***************
*** 35,45 ****
          else:
              for k, v in dict.items():
!                 self.data[k] = v
      def get(self, key, failobj=None):
!         return self.data.get(key, failobj)
      def setdefault(self, key, failobj=None):
!         if not self.data.has_key(key):
!             self.data[key] = failobj
!         return self.data[key]
      def popitem(self):
          return self.data.popitem()
--- 35,47 ----
          else:
              for k, v in dict.items():
!                 self[k] = v
      def get(self, key, failobj=None):
!         if not self.has_key(key):
!             return failobj
!         return self[key]
      def setdefault(self, key, failobj=None):
!         if not self.has_key(key):
!             self[key] = failobj
!         return self[key]
      def popitem(self):
          return self.data.popitem()