From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Mon, 14 Mar 2011 22:53:59 +0000 (-0400)
Subject: Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified
X-Git-Tag: v2.7.2rc1~253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1aa999c49ed82c89257c13cba5e210c3ba34c130;p=python

Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified
IP addresses in the proxy exception list.
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 1553f9dcb2..84e9dbc347 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1396,7 +1396,7 @@ if sys.platform == 'darwin':
 
                 else:
                     mask = int(mask[1:])
-                    mask = 32 - mask
+                mask = 32 - mask
 
                 if (hostIP >> mask) == (base >> mask):
                     return True
diff --git a/Misc/NEWS b/Misc/NEWS
index 16ab29573d..af1ba7f4fc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified 
+  IP addresses in the proxy exception list. 
+
 - Issue #11131: Fix sign of zero in plus and minus operations when
   the context rounding mode is ROUND_FLOOR.