Merged revisions 75482 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75482 | ronald.oussoren | 2009-10-18 09:07:00 +0200 (Sun, 18 Oct 2009) | 3 lines

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

diff --git a/Lib/urllib.py b/Lib/urllib.py
index a5c8fa241cf2daed101e4ee7e14927e4b2165def..1ae08a0be46e586b9390678932e45f6346f20af6 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1344,6 +1344,8 @@ if sys.platform == 'darwin':
         import socket
         from fnmatch import fnmatch
 
+        hostonly, port = splitport(host)
+
         def ip2num(ipAddr):
             parts = ipAddr.split('.')
             parts = map(int, parts)
@@ -1358,6 +1360,8 @@ if sys.platform == 'darwin':
             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
@@ -1365,8 +1369,11 @@ if sys.platform == 'darwin':
             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:])

diff --git a/Misc/NEWS b/Misc/NEWS
index f60ad1385d0e86ca8cce87316e92ded8e7c104f1..3e7fd69065671373f0aa2ae39911f7943416c681 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #7149: fix exception in urllib when detecting proxy settings on OSX.
+
 - Issue #7120: logging: Removed import of multiprocessing which is causing
   crash in GAE.