[Python-checkins] r82286 - in python/branches/py3k: Lib/urllib/request.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Jun 27 16:26:30 2010
New Revision: 82286

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/urllib/request.py

Modified: python/branches/py3k/Lib/urllib/request.py
==============================================================================
--- python/branches/py3k/Lib/urllib/request.py	(original)
+++ python/branches/py3k/Lib/urllib/request.py	Sun Jun 27 16:26:30 2010
@@ -2204,8 +2204,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