From: Ronald Oussoren Date: Sun, 20 Sep 2009 10:54:47 +0000 (+0000) Subject: Merged revisions 74964 via svnmerge from X-Git-Tag: v2.6.3rc1~42 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78974dff8f6078ef354fc2184265d779255983e5;p=python 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 ........ --- diff --git a/Lib/urllib.py b/Lib/urllib.py index b24e9eafc3..a5c8fa241c 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -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)