commit b96fbb8d0058efa0b1b8d6adbe875488cb03e4fc
author Ronald Oussoren <ronaldoussoren@mac.com> Sun Jun 27 13:59:39 2010 +0000
committer Ronald Oussoren <ronaldoussoren@mac.com> Sun Jun 27 13:59:39 2010 +0000
tree 85c7b0b0a138a4ed8eb9214ba422142d355615d4
parent 76002c8f1d9e367788fc55a4aa7685189416ebc6

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

diff --git a/Lib/urllib.py b/Lib/urllib.py
index de67f67..707e2f0 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1383,8 +1383,13 @@
                         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