[Python-checkins] r76041 - in python/branches/release31-maint: Lib/test/support.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Nov  1 23:28:14 2009
New Revision: 76041

Log:
Merged revisions 76040 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76040 | antoine.pitrou | 2009-11-01 23:13:48 +0100 (dim., 01 nov. 2009) | 9 lines
  
  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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/support.py

Modified: python/branches/release31-maint/Lib/test/support.py
==============================================================================
--- python/branches/release31-maint/Lib/test/support.py	(original)
+++ python/branches/release31-maint/Lib/test/support.py	Sun Nov  1 23:28:14 2009
@@ -455,9 +455,16 @@
             return open(fn, *args, **kw)
 
     print('\tfetching %s ...' % url, file=get_original_stdout())
-    fn, _ = urllib.request.urlretrieve(url, filename)
-    return open(fn, *args, **kw)
-
+    f = urllib.request.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, *args, **kw)
 
 class WarningsRecorder(object):
     """Convenience wrapper for the warnings list returned on