Commit 78974dff authored by Ronald Oussoren's avatar Ronald Oussoren

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
........
parent 40617a8e
......@@ -1358,9 +1358,8 @@ if sys.platform == 'darwin':
if proxy_settings['exclude_simple']:
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
value = sc.CFArrayGetValueAtIndex(exceptions, index)
if not value: continue
m = re.match(r"(\d+(?:\.\d+)*)(/\d+)?", value)
......
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