summaryrefslogtreecommitdiffstats
path: root/Lib/UserDict.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2008-02-21 18:18:37 (GMT)
committerGuido van Rossum <guido@python.org>2008-02-21 18:18:37 (GMT)
commit8bc0965adfbe55926a475370c70a8366462daccc (patch)
tree243302c6d0cae2fd0328aab4841409d148a10e80 /Lib/UserDict.py
parentb5e2684a1a7091239109b9f91be6c36fc75fdccb (diff)
downloadcpython-8bc0965adfbe55926a475370c70a8366462daccc.zip
cpython-8bc0965adfbe55926a475370c70a8366462daccc.tar.gz
cpython-8bc0965adfbe55926a475370c70a8366462daccc.tar.bz2
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.
Diffstat (limited to 'Lib/UserDict.py')
-rw-r--r--Lib/UserDict.py2
1 files changed, 1 insertions, 1 deletions
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 @@ class UserDict:
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):