commit 7d7702b5819f2ef262353055f265c7d8d1f39823
author Senthil Kumaran <senthil@uthcode.com> Wed Jul 27 09:37:17 2011 +0800
committer Senthil Kumaran <senthil@uthcode.com> Wed Jul 27 09:37:17 2011 +0800
tree 303809f1c5ebfc56e7a3476b543628a5987f6c95
parent d8b1723965ba05d579525c9f09a79d58c18b4a84

merge from 3.2 - fix urlopen behavior on sites which do not send (or obsfuscates) Connection: Close header.

Lib/urllib2.py

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 2bce745..a0065b5 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -1166,14 +1166,14 @@
 
         try:
             h.request(req.get_method(), req.get_selector(), req.data, headers)
+        except socket.error, err: # XXX what error?
+            h.close()
+            raise URLError(err)
+        else:
             try:
                 r = h.getresponse(buffering=True)
-            except TypeError: #buffering kw not supported
+            except TypeError: # buffering kw not supported
                 r = h.getresponse()
-        except socket.error, err: # XXX what error?
-            raise URLError(err)
-        finally:
-            h.close()
 
         # Pick apart the HTTPResponse object to get the addinfourl
         # object initialized properly.