Patch #413171: Implement get, setdefault, update in terms of

has_key, __getitem__, and __setitem__.

diff --git a/Lib/UserDict.py b/Lib/UserDict.py
index 204ca150febbab671f2729614aca2129d216cd0b..fbd601a88f5dee5f5fba597caf2449a64b294186 100644 (file)
--- a/Lib/UserDict.py
+++ b/Lib/UserDict.py
@@ -34,13 +34,15 @@ class UserDict:
             self.data.update(dict)
         else:
             for k, v in dict.items():
-                self.data[k] = v
+                self[k] = v
     def get(self, key, failobj=None):
-        return self.data.get(key, failobj)
+        if not self.has_key(key):
+            return failobj
+        return self[key]
     def setdefault(self, key, failobj=None):
-        if not self.data.has_key(key):
-            self.data[key] = failobj
-        return self.data[key]
+        if not self.has_key(key):
+            self[key] = failobj
+        return self[key]
     def popitem(self):
         return self.data.popitem()
     def __contains__(self, key):