Merge lp:~jtaylor/ubuntu/oneiric/distribute/fix-910965 into lp:ubuntu/oneiric/distribute

[Julian Taylor]

Note the fix does not reintroduce issue 196 as the method only returns one entry of the header even if there are multiple. see http://docs.python.org/release/3.1.3/library/email.message.html#email.message.Message __getitem__
https://bitbucket.org/tarek/distribute/issue/196/
https://bitbucket.org/tarek/distribute/issue/206/

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-20 11:30:25 +0000
+++ debian/changelog	2012-01-02 23:09:27 +0000
@@ -1,3 +1,10 @@
+distribute (0.6.16-1ubuntu0.1) oneiric-proposed; urgency=low
+
+  * setuptools/package_index.py:
+    - add easy_install HTTPMessage fix from 0.6.19 (LP: #910965)
+
+ -- Julian Taylor <[e-mail]>  Mon, 02 Jan 2012 23:51:58 +0100
+
 distribute (0.6.16-1) unstable; urgency=medium
 
   * New upstream version.

=== modified file 'setuptools/package_index.py'
--- setuptools/package_index.py	2011-05-20 11:30:25 +0000
+++ setuptools/package_index.py	2012-01-02 23:09:27 +0000
@@ -580,7 +580,7 @@
             size = -1
             if "content-length" in headers:
                 # Some servers return multiple Content-Length headers :(
-                content_length = headers.getheaders("Content-Length")[0]
+                content_length = headers.get("Content-Length")
                 size = int(content_length)
                 self.reporthook(url, filename, blocknum, bs, size)
             tfp = open(filename,'wb')