diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-20 10:54:47 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-20 10:54:47 (GMT) |
| commit | 78974dff8f6078ef354fc2184265d779255983e5 (patch) | |
| tree | 772b0a3394cb4038f782ef79300fb58d9d64258e /Lib | |
| parent | 40617a8eae014941aa6af779d6be0b8d36e1db2c (diff) | |
| download | cpython-78974dff8f6078ef354fc2184265d779255983e5.zip cpython-78974dff8f6078ef354fc2184265d779255983e5.tar.gz cpython-78974dff8f6078ef354fc2184265d779255983e5.tar.bz2 | |
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
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/urllib.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index b24e9ea..a5c8fa2 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) |