From: Benjamin Peterson <benjamin@python.org> Date: Wed, 16 Jul 2008 18:52:50 +0000 (+0000) Subject: Merged revisions 65026 via svnmerge from X-Git-Tag: v3.0b2~23 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c47753b38fe28269148a6b735d9829f187dd527d;p=python Merged revisions 65026 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r65026 | benjamin.peterson | 2008-07-16 13:48:35 -0500 (Wed, 16 Jul 2008) | 9 lines Merged revisions 65025 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r65025 | benjamin.peterson | 2008-07-16 13:46:30 -0500 (Wed, 16 Jul 2008) | 1 line remove use of has_key ........ ................ --- diff --git a/Lib/lib2to3/fixes/fix_urllib.py b/Lib/lib2to3/fixes/fix_urllib.py index 1255085a59..78bf7abc68 100644 --- a/Lib/lib2to3/fixes/fix_urllib.py +++ b/Lib/lib2to3/fixes/fix_urllib.py @@ -120,7 +120,7 @@ class FixUrllib(FixImports): if member != ',': for change in MAPPING[mod_member.value]: if member in change[1]: - if mod_dict.has_key(change[0]): + if change[0] in mod_dict: mod_dict[change[0]].append(member) else: mod_dict[change[0]] = [member]