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 1255085a594e3dc550895b1bda1a7e01f9c81e02..78bf7abc687018a58320d02a4192265f25657645 100644 (file)
--- 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]