mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 00:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 82284 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82284 | ronald.oussoren | 2010-06-27 15:59:39 +0200 (Sun, 27 Jun 2010) | 4 lines

  Fix for Issue8883: without this patch test_urllib will fail
  when there is a bare IP address in the "Bypass proxy settings
  for these Hosts & Domains" list on MacOSX.
........
This commit is contained in:
Ronald Oussoren 2010-06-27 14:00:56 +00:00
parent 3d3ffd8c44
commit 68f74ba556
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/urllib.py
View file

@ -1375,8 +1375,13 @@ if sys.platform == 'darwin':
continue continue
base = ip2num(m.group(1)) base = ip2num(m.group(1))
mask = int(m.group(2)[1:]) mask = m.group(2)
mask = 32 - mask if mask is None:
mask = 8 * (m.group(1).count('.') + 1)
else:
mask = int(mask[1:])
mask = 32 - mask
if (hostIP >> mask) == (base >> mask): if (hostIP >> mask) == (base >> mask):
return True return True