merge from 3.2 - Correcting issue 12576 fix, which resulted in buildbot failures.

This commit is contained in:
Senthil Kumaran 2011-07-27 09:32:04 +08:00
commit 4d90b19373
1 changed files with 3 additions and 6 deletions

View File

@ -1144,13 +1144,10 @@ class AbstractHTTPHandler(BaseHandler):
try:
h.request(req.get_method(), req.selector, req.data, headers)
except socket.error as err: # timeout error
h.close()
raise URLError(err)
finally:
try:
r = h.getresponse() # an HTTPResponse instance
except Exception as exp:
h.close()
raise exp
else:
r = h.getresponse()
r.url = req.get_full_url()
# This line replaces the .msg attribute of the HTTPResponse