Merge lp:~smoser/python/lp-813295 into lp:~doko/python/pkg2.7-debian

[Scott Moser]

This pulls in the upstream commit that fixed
 - upstream issue http://bugs.python.org/issue12576
 - ubuntu bug 813295

I'm not sure if merge proposals to this branch is how you'd want things submitted or not, but here it is.

[Barry Warsaw (barry)]

Since this was pulled from the upstream changeset, it looks fine. However, I'm going to re-open the upstream because I think the change needs to be back ported to Python 2.7.

[Barry Warsaw (barry)]

Never mind. The change *was* applied to 2.7, but didn't get linked in the tracker.

[Barry Warsaw (barry)]

Doko says in private email to go ahead and apply/upload this patch to Ubuntu now. He'll sort out the delta with Debian later.

[Barry Warsaw (barry)]

Oh, in case it's not clear, I'm doing that now :)

=== added file 'patches/issue12576.diff'
--- patches/issue12576.diff	1970-01-01 00:00:00 +0000
+++ patches/issue12576.diff	2011-07-27 15:52:26 +0000
@@ -0,0 +1,51 @@
+# DP: fix upstream issue 12576
+
+changeset:   71523:b66bbbdc7abd
+branch:      2.7
+parent:      71518:73ae3729b8fe
+user:        Senthil Kumaran <[e-mail]>
+date:        Wed Jul 27 09:37:17 2011 +0800
+summary:     merge from 3.2 - fix urlopen behavior on sites which do not send (or obsfuscates) Connection: Close header.
+
+diff -r 73ae3729b8fe -r b66bbbdc7abd Lib/test/test_urllib2net.py
+--- a/Lib/test/test_urllib2net.py	Tue Jul 26 18:16:08 2011 -0700
++++ b/Lib/test/test_urllib2net.py	Wed Jul 27 09:37:17 2011 +0800
+@@ -186,6 +186,14 @@
+             opener.open(request)
+             self.assertEqual(request.get_header('User-agent'),'Test-Agent')
+ 
++    def test_sites_no_connection_close(self):
++        # Some sites do not send Connection: close header.
++        # Verify that those work properly. (#issue12576)
++
++        req = urllib2.urlopen('http://www.imdb.com')
++        res = req.read()
++        self.assertTrue(res)
++
+     def _test_urls(self, urls, handlers, retry=True):
+         import time
+         import logging
+diff -r 73ae3729b8fe -r b66bbbdc7abd Lib/urllib2.py
+--- a/Lib/urllib2.py	Tue Jul 26 18:16:08 2011 -0700
++++ b/Lib/urllib2.py	Wed Jul 27 09:37:17 2011 +0800
+@@ -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.
+

=== modified file 'patches/series.in'
--- patches/series.in	2011-07-09 19:39:36 +0000
+++ patches/series.in	2011-07-27 15:52:26 +0000
@@ -54,3 +54,4 @@
 bsddb-libpath.diff
 platform-linux3.diff
 disable-sem-check.diff
+issue12576.diff