From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 1 Nov 2009 22:13:48 +0000 (+0000)
Subject: Merged revisions 76037 via svnmerge from
X-Git-Tag: v3.2a1~2251
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd0680b19dfccf7bdb8b3f5e90c2e0bc2fd2aa00;p=python

Merged revisions 76037 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76037 | antoine.pitrou | 2009-11-01 23:02:03 +0100 (dim., 01 nov. 2009) | 3 lines

  Use a custom timeout in test_support.open_urlresource.
........
---

diff --git a/Lib/test/support.py b/Lib/test/support.py
index a7cac4a7a4..0c69aac6de 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -458,10 +458,17 @@ def open_urlresource(url, *args, **kw):
         return open(fn, *args, **kw)
 
     print('\tfetching %s ...' % url, file=get_original_stdout())
-    fn, _ = urllib.request.urlretrieve(url, fn)
+    f = urllib.request.urlopen(url, timeout=15)
+    try:
+        with open(fn, "wb") as out:
+            s = f.read()
+            while s:
+                out.write(s)
+                s = f.read()
+    finally:
+        f.close()
     return open(fn, *args, **kw)
 
-
 class WarningsRecorder(object):
     """Convenience wrapper for the warnings list returned on
        entry to the warnings.catch_warnings() context manager.