Correcting issue 12576 fix, which resulted in buildbot failures.
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 534408d..1dda966 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1135,13 +1135,10 @@
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