summaryrefslogtreecommitdiffstats
path: root/Lib/lib2to3
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-07-16 18:52:50 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-07-16 18:52:50 (GMT)
commitc47753b38fe28269148a6b735d9829f187dd527d (patch)
tree0f83bc6bb8d589b8a1b0b13d0d19a23f1831b451 /Lib/lib2to3
parentd613bb4c292635ead23b30af0c9bb83abc81d2be (diff)
downloadcpython-c47753b38fe28269148a6b735d9829f187dd527d.zip
cpython-c47753b38fe28269148a6b735d9829f187dd527d.tar.gz
cpython-c47753b38fe28269148a6b735d9829f187dd527d.tar.bz2
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 ........ ................
Diffstat (limited to 'Lib/lib2to3')
-rw-r--r--Lib/lib2to3/fixes/fix_urllib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/lib2to3/fixes/fix_urllib.py b/Lib/lib2to3/fixes/fix_urllib.py
index 1255085..78bf7ab 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]