Commit 02ddff42 authored by Mark Dickinson's avatar Mark Dickinson

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.
........
parent 091e6c26
...@@ -2163,7 +2163,7 @@ if sys.platform == 'darwin': ...@@ -2163,7 +2163,7 @@ if sys.platform == 'darwin':
def ip2num(ipAddr): def ip2num(ipAddr):
parts = ipAddr.split('.') parts = ipAddr.split('.')
parts = map(int, parts) parts = list(map(int, parts))
if len(parts) != 4: if len(parts) != 4:
parts = (parts + [0, 0, 0, 0])[:4] parts = (parts + [0, 0, 0, 0])[:4]
return (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8) | parts[3] return (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8) | parts[3]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment