[Python-checkins] r74965 - in python/branches/release26-maint: Lib/urllib.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Sep 20 12:54:47 2009
New Revision: 74965

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/urllib.py

Modified: python/branches/release26-maint/Lib/urllib.py
==============================================================================
--- python/branches/release26-maint/Lib/urllib.py	(original)
+++ python/branches/release26-maint/Lib/urllib.py	Sun Sep 20 12:54:47 2009
@@ -1358,9 +1358,8 @@
             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)