[Python-checkins] cpython (2.6): Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py.

Mon Feb 20 20:46:10 CET 2012

http://hg.python.org/cpython/rev/90ec0bc01f3b
changeset: 75067:90ec0bc01f3b
branch: 2.6
parent: 75014:24244a744d01
user: Barry Warsaw <barry at python.org>
date: Mon Feb 20 14:43:22 2012 -0500
summary:
 Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py.
files:
 Lib/test/test_urllib2.py | 1 +
 1 files changed, 1 insertions(+), 0 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
@@ -950,6 +950,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
-- 
Repository URL: http://hg.python.org/cpython
