summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-05-09 12:17:58 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-05-09 12:17:58 (GMT)
commitb7d943625cf4353f6cb72df16252759f2dbd8e06 (patch)
tree3d2834c7dd3bb0b16d0dcd841c3e7b3c5ae2a1e9
parent9c39bc72650869755233bf08c3f3c78eb6c7ddfe (diff)
downloadcpython-b7d943625cf4353f6cb72df16252759f2dbd8e06.zip
cpython-b7d943625cf4353f6cb72df16252759f2dbd8e06.tar.gz
cpython-b7d943625cf4353f6cb72df16252759f2dbd8e06.tar.bz2
Merged revisions 81024 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r81024 | mark.dickinson | 2010-05-09 13:16:29 +0100 (Sun, 09 May 2010) | 1 line Fix test_urllib2 failure on OS X. ........
-rw-r--r--Lib/urllib/request.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 6a2ce91..5440efb 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2163,7 +2163,7 @@ if sys.platform == 'darwin':
def ip2num(ipAddr):
parts = ipAddr.split('.')
- parts = map(int, parts)
+ parts = list(map(int, parts))
if len(parts) != 4:
parts = (parts + [0, 0, 0, 0])[:4]
return (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8) | parts[3]