Index: UserDict.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/UserDict.py,v
retrieving revision 1.11
diff -c -r1.11 UserDict.py
*** UserDict.py	2001/02/18 03:30:53	1.11
--- UserDict.py	2001/04/02 17:10:23
***************
*** 31,42 ****
              self.data.update(dict)
          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()
--- 31,44 ----
              self.data.update(dict)
          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()