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/test_support.py b/Lib/test/test_support.py
index c9fb092dd3a578ad520e94eb16287b08dcd380a7..d4b891e2e40ff92f0eda98fcb22458773a929c00 100644 (file)
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -378,7 +378,7 @@ def check_syntax_error(testcase, statement):
         testcase.fail('Missing SyntaxError: "%s"' % statement)
 
 def open_urlresource(url):
-    import urllib, urlparse
+    import urlparse, urllib2
 
     requires('urlfetch')
     filename = urlparse.urlparse(url)[2].split('/')[-1] # '/': it's URL!
@@ -389,8 +389,16 @@ def open_urlresource(url):
             return open(fn)
 
     print >> get_original_stdout(), '\tfetching %s ...' % url
-    fn, _ = urllib.urlretrieve(url, filename)
-    return open(fn)
+    f = urllib2.urlopen(url, timeout=15)
+    try:
+        with open(filename, "wb") as out:
+            s = f.read()
+            while s:
+                out.write(s)
+                s = f.read()
+    finally:
+        f.close()
+    return open(filename)
 
 
 class WarningsRecorder(object):