commit f5a5beb33985b4b55480de267084b90d89a5c5c4
author Barry Warsaw <barry@python.org> Mon Feb 20 14:43:22 2012 -0500
committer Barry Warsaw <barry@python.org> Mon Feb 20 14:43:22 2012 -0500
tree be9be4d59d6d1cdad9317111be033613c5b3cd9e
parent 66f3cc6f8de83c447d937160e4a1630c4482b5f5

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

Lib/test/test_urllib2.py

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 8250aab..640c661 100644
--- 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