[Python-checkins] r75482 - in python/trunk: Lib/urllib.py Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Oct 18 09:07:00 2009
New Revision: 75482

Log:
Fix for issue 7149: a regression in 2.6.3 that causes an exception when 
trying to detect proxy settings on OSX.


Modified:
   python/trunk/Lib/urllib.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/urllib.py
==============================================================================
--- python/trunk/Lib/urllib.py	(original)
+++ python/trunk/Lib/urllib.py	Sun Oct 18 09:07:00 2009
@@ -1340,6 +1340,8 @@
         import socket
         from fnmatch import fnmatch
 
+        hostonly, port = splitport(host)
+
         def ip2num(ipAddr):
             parts = ipAddr.split('.')
             parts = map(int, parts)
@@ -1354,6 +1356,8 @@
             if proxy_settings['exclude_simple']:
                 return True
 
+        hostIP = None
+
         for value in proxy_settings.get('exceptions', ()):
             # Items in the list are strings like these: *.local, 169.254/16
             if not value: continue
@@ -1361,8 +1365,11 @@
             m = re.match(r"(\d+(?:\.\d+)*)(/\d+)?", value)
             if m is not None:
                 if hostIP is None:
-                    hostIP = socket.gethostbyname(host)
-                    hostIP = ip2num(hostIP)
+                    try:
+                        hostIP = socket.gethostbyname(hostonly)
+                        hostIP = ip2num(hostIP)
+                    except socket.error:
+                        continue
 
                 base = ip2num(m.group(1))
                 mask = int(m.group(2)[1:])

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Oct 18 09:07:00 2009
@@ -411,6 +411,8 @@
 Library
 -------
 
+- Issue #7149: urllib fails on OSX in the proxy detection code
+
 - Issue #7069: Make inspect.isabstract() return a boolean.
 
 - Add support to the `ihooks` module for relative imports.