From 45686b472bf1f9e5ce1ef6953c4b123d271b2dc7 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <senthil@uthcode.com>
Date: Wed, 27 Jul 2011 09:31:03 +0800
Subject: Correcting issue 12576 fix, which resulted in buildbot failures.

---
 Lib/urllib/request.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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 @@ 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
-- 
cgit v0.12