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

orsenthil · orsenthil · commit 4d90b19373a7 · 2011-07-27T09:32:04.000+08:00
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
@@ -1144,13 +1144,10 @@ def do_open(self, http_class, req, **http_conn_args):
         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
