[Python-checkins] r82287 - in python/branches/release31-maint: Lib/urllib/request.py
ronald.oussoren
python-checkins at python.org
Sun Jun 27 16:27:27 CEST 2010
Author: ronald.oussoren
Date: Sun Jun 27 16:27:27 2010
New Revision: 82287
Log:
Merged revisions 82286 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r82286 | ronald.oussoren | 2010-06-27 16:26:30 +0200 (Sun, 27 Jun 2010) | 11 lines
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/release31-maint/ (props changed)
python/branches/release31-maint/Lib/urllib/request.py
Modified: python/branches/release31-maint/Lib/urllib/request.py
==============================================================================
--- python/branches/release31-maint/Lib/urllib/request.py (original)
+++ python/branches/release31-maint/Lib/urllib/request.py Sun Jun 27 16:27:27 2010
@@ -2208,8 +2208,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
More information about the Python-checkins
mailing list