diff options
| -rw-r--r-- | Lib/urllib.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 11 insertions, 2 deletions
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 @@ if sys.platform == 'darwin': 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 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 @@ -1361,8 +1365,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:]) @@ -411,6 +411,8 @@ Core and Builtins 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. |