summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2012-02-20 19:43:22 (GMT)
committerBarry Warsaw <barry@python.org>2012-02-20 19:43:22 (GMT)
commitf5a5beb33985b4b55480de267084b90d89a5c5c4 (patch)
treebe9be4d59d6d1cdad9317111be033613c5b3cd9e
parent66f3cc6f8de83c447d937160e4a1630c4482b5f5 (diff)
downloadcpython-f5a5beb33985b4b55480de267084b90d89a5c5c4.zip
cpython-f5a5beb33985b4b55480de267084b90d89a5c5c4.tar.gz
cpython-f5a5beb33985b4b55480de267084b90d89a5c5c4.tar.bz2
Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py.
-rw-r--r--Lib/test/test_urllib2.py1
1 files changed, 1 insertions, 0 deletions
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 @@ 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