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 8b4029d..db8e616 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -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:])
diff --git a/Misc/NEWS b/Misc/NEWS
index 2ac0d9f..d694056 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.