]> granicus.if.org Git - python/commitdiff
Merged revisions 81024 via svnmerge from
authorMark Dickinson <dickinsm@gmail.com>
Sun, 9 May 2010 12:17:58 +0000 (12:17 +0000)
committerMark Dickinson <dickinsm@gmail.com>
Sun, 9 May 2010 12:17:58 +0000 (12:17 +0000)
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.
........

Lib/urllib/request.py

index 6a2ce910504443c16b0db37d1f52b6c94a42a6dc..5440efb905420cbc35832164384c097f45658a99 100644 (file)
@@ -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]