From b96fbb8d0058efa0b1b8d6adbe875488cb03e4fc Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Sun, 27 Jun 2010 13:59:39 +0000 Subject: [PATCH] Fix for Issue8883: without this patch test_urllib will fail when there is a bare IP address in the "Bypass proxy settings for these Hosts & Domains" list on MacOSX. --- Lib/urllib.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Lib/urllib.py b/Lib/urllib.py index de67f6721d1..707e2f0c65f 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -1383,8 +1383,13 @@ if sys.platform == 'darwin': continue base = ip2num(m.group(1)) - mask = int(m.group(2)[1:]) - mask = 32 - mask + mask = m.group(2) + if mask is None: + mask = 8 * (m.group(1).count('.') + 1) + + else: + mask = int(mask[1:]) + mask = 32 - mask if (hostIP >> mask) == (base >> mask): return True