[Python-checkins] cpython (merge 2.7 -> 2.7): Merge cleanup.

[guido.van.rossum]

http://hg.python.org/cpython/rev/34d5d794ccc1
changeset:   69057:34d5d794ccc1
branch:      2.7
parent:      69052:b2934d98dac1
parent:      69046:163dc7be1afd
user:        Guido van Rossum <guido at python.org>
date:        Tue Mar 29 13:04:24 2011 -0700
summary:
  Merge cleanup.

files:
  Lib/test/test_urllib2.py |  1 +
  Misc/NEWS                |  6 +++---
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -977,6 +977,7 @@
         h = urllib2.HTTPRedirectHandler()
         o = h.parent = MockOpener()
         req = Request(from_url)
+        req.timeout = socket._GLOBAL_DEFAULT_TIMEOUT
 
         for scheme in invalid_schemes:
             invalid_url = scheme + '://' + schemeless_url
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,9 +16,6 @@
 - Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when
   there are many tags (e.g. when using mq).  Patch by Nadeem Vawda.
 
-- Issue #11662: Make urllib and urllib2 ignore redirections if the
-  scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
-
 - Issue #10451: memoryview objects could allow to mutate a readable buffer.
   Initial patch by Ross Lagerwall.
 
@@ -50,6 +47,9 @@
 Library
 -------
 
+- Issue #11662: Make urllib and urllib2 ignore redirections if the
+  scheme is not HTTP, HTTPS or FTP (CVE-2011-1521).
+
 - Issue #11256: Fix inspect.getcallargs on functions that take only keyword
   arguments.
 

-- 
Repository URL: http://hg.python.org/cpython