Merge Issue 11662 from 3.2 branch.

diff --cc Lib/test/test_urllib.py
Simple merge

diff --cc Lib/test/test_urllib2.py
Simple merge

diff --cc Lib/urllib/request.py
Simple merge

diff --cc Misc/NEWS
index f70998c9db7fa51019fc54928cf8d6f550ea6bec,04c9faee932db0e485c1befc60ab7974f12d72fd..d85972de882db24ba25ec55af66ff15799647f5b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -84,26 -49,10 +84,29 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #11628: cmp_to_key generated class should use __slots__
+ - Issue #11662: Make urllib and urllib2 ignore redirections if the
+   scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
+ 
 +- Issue #6811: Allow importlib to change a code object's co_filename attribute
 +  to match the path to where the source code currently is, not where the code
 +  object originally came from.
 +
 +- Issue #8754: Have importlib use the repr of a module name in error messages.
 +
 +- Issue #11591: Prevent "import site" from modifying sys.path when python
 +  was started with -S.
 +
 +- collections.namedtuple() now adds a _source attribute to the generated
 +  class.  This make the source more accessible than the outdated
 +  "verbose" option which prints to stdout but doesn't make the source
 +  string available.
 +
 +- Issue #11371: Mark getopt error messages as localizable.  Patch by Filip
 +  Gruszczyński.
 +
 +- Issue #11333: Add __slots__ to collections ABCs.
 +
 +- Issue #11628: cmp_to_key generated class should use __slots__.
  
  - Issue #5537: Fix time2isoz() and time2netscape() functions of
    httplib.cookiejar for expiration year greater than 2038 on 32-bit systems.