Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Try to get test_urllib to pass on Windows by closing the file. 

I'm guessing that's the problem.  h.getfile() must be called *after*
h.getreply() and the fp can be None.

I'm not entirely convinced this is the best fix (or even correct).
The buildbots will tell us if things improve or not.  I don't
know if this needs to be backported (assuming it actually works).
This commit is contained in:
Neal Norwitz 2007-03-20 08:14:57 +00:00
parent 6cbd8de641
commit ce55e21c70
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/urllib.py
View File

@ -326,11 +326,12 @@ class URLopener:
if data is not None: if data is not None:
h.send(data) h.send(data)
errcode, errmsg, headers = h.getreply() errcode, errmsg, headers = h.getreply()
fp = h.getfile()
if errcode == -1: if errcode == -1:
if fp: fp.close()
# something went wrong with the HTTP status line # something went wrong with the HTTP status line
raise IOError, ('http protocol error', 0, raise IOError, ('http protocol error', 0,
'got a bad status line', None) 'got a bad status line', None)
fp = h.getfile()
if errcode == 200: if errcode == 200:
return addinfourl(fp, headers, "http:" + url) return addinfourl(fp, headers, "http:" + url)
else: else:
@ -417,11 +418,12 @@ class URLopener:
if data is not None: if data is not None:
h.send(data) h.send(data)
errcode, errmsg, headers = h.getreply() errcode, errmsg, headers = h.getreply()
fp = h.getfile()
if errcode == -1: if errcode == -1:
if fp: fp.close()
# something went wrong with the HTTP status line # something went wrong with the HTTP status line
raise IOError, ('http protocol error', 0, raise IOError, ('http protocol error', 0,
'got a bad status line', None) 'got a bad status line', None)
fp = h.getfile()
if errcode == 200: if errcode == 200:
return addinfourl(fp, headers, "https:" + url) return addinfourl(fp, headers, "https:" + url)
else: else: