From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 27 Jun 2010 13:59:39 +0000 (+0000)
Subject: Fix for Issue8883: without this patch test_urllib will fail
X-Git-Tag: v2.7~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b96fbb8d0058efa0b1b8d6adbe875488cb03e4fc;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index de67f6721d1c..707e2f0c65f0 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