From: Barry Warsaw <barry@python.org>
Date: Mon, 20 Feb 2012 19:43:22 +0000 (-0500)
Subject: Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py.
X-Git-Tag: v2.7.3rc1~34^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5a5beb33985b4b55480de267084b90d89a5c5c4;p=thirdparty%2FPython%2Fcpython.git

Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py.
---

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 8250aab93522..640c6616ca7a 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -950,6 +950,7 @@ class HandlerTests(unittest.TestCase):
         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