Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 74964 via svnmerge from 

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

........
  r74964 | ronald.oussoren | 2009-09-20 12:54:07 +0200 (Sun, 20 Sep 2009) | 2 lines

  Followup for r74962
........
This commit is contained in:
Ronald Oussoren 2009-09-20 10:54:47 +00:00
parent 40617a8eae
commit 78974dff8f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/urllib.py
View File

@ -1358,9 +1358,8 @@ if sys.platform == 'darwin':
if proxy_settings['exclude_simple']: if proxy_settings['exclude_simple']:
return True return True
for value in proxy_settings.get('exceptions'): for value in proxy_settings.get('exceptions', ()):
# Items in the list are strings like these: *.local, 169.254/16 # Items in the list are strings like these: *.local, 169.254/16
value = sc.CFArrayGetValueAtIndex(exceptions, index)
if not value: continue if not value: continue
m = re.match(r"(\d+(?:\.\d+)*)(/\d+)?", value) m = re.match(r"(\d+(?:\.\d+)*)(/\d+)?", value)