Merged revisions 82284 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82284 | ronald.oussoren | 2010-06-27 15:59:39 +0200 (Sun, 27 Jun 2010) | 4 lines

  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 70900cd211e930148ec6bd418b488751c197b0a3..da4f56ed8980ee4422be3fdd00923927aed35d20 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1375,8 +1375,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