mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-16 06:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 76037 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Antoine Pitrou 2009-11-01 22:06:59 +00:00
parent 1ccb66a5bd
commit 07728e9b46
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_support.py
View file

@ -378,7 +378,7 @@ def check_syntax_error(testcase, statement):
testcase.fail('Missing SyntaxError: "%s"' % statement) testcase.fail('Missing SyntaxError: "%s"' % statement)
def open_urlresource(url): def open_urlresource(url):
import urllib, urlparse import urlparse, urllib2
requires('urlfetch') requires('urlfetch')
filename = urlparse.urlparse(url)[2].split('/')[-1] # '/': it's URL! filename = urlparse.urlparse(url)[2].split('/')[-1] # '/': it's URL!
@ -389,8 +389,16 @@ def open_urlresource(url):
return open(fn) return open(fn)
print >> get_original_stdout(), '\tfetching %s ...' % url print >> get_original_stdout(), '\tfetching %s ...' % url
fn, _ = urllib.urlretrieve(url, filename) f = urllib2.urlopen(url, timeout=15)
return open(fn) 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): class WarningsRecorder(object):