[Python-checkins] r65026 - in python/trunk/Lib/lib2to3: fixes/fix_urllib.py

Wed Jul 16 20:48:35 CEST 2008

Author: benjamin.peterson
Date: Wed Jul 16 20:48:35 2008
New Revision: 65026
Log:
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 (2008年7月16日) | 1 line
 
 remove use of has_key
........
Modified:
 python/trunk/Lib/lib2to3/ (props changed)
 python/trunk/Lib/lib2to3/fixes/fix_urllib.py
Modified: python/trunk/Lib/lib2to3/fixes/fix_urllib.py
==============================================================================

--- python/trunk/Lib/lib2to3/fixes/fix_urllib.py	(original)
+++ python/trunk/Lib/lib2to3/fixes/fix_urllib.py	Wed Jul 16 20:48:35 2008
@@ -120,7 +120,7 @@
 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]
