Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given. More work like this needs to
be done in the rest of the stdlib.
diff --git a/Lib/UserDict.py b/Lib/UserDict.py
index 5e97817..a786ae0 100644
--- a/Lib/UserDict.py
+++ b/Lib/UserDict.py
@@ -55,7 +55,7 @@
if len(kwargs):
self.data.update(kwargs)
def get(self, key, failobj=None):
- if not self.has_key(key):
+ if key not in self:
return failobj
return self[key]
def setdefault(self, key, failobj=None):