Merge ~ahasenack/ubuntu/+source/libcloud:more-dep8-fixes into ~ahasenack/ubuntu/+source/libcloud:master

[Andreas Hasenack]

This adds the remaining test fix that was accepted upstream.

Bileto ticket: https://bileto.ubuntu.com/#/ticket/3392

All libcloud tests are green now.

Again the target branch is just my own, since git-ubuntu fails to import libcloud. I did a gbp import of the current cosmic package and based my branch on that.

[Christian Ehrhardt  (paelzer)]

Hmm the MP here is "superseded" so you gave up and will try new with another approach?

[Andreas Hasenack (ahasenack)]

It has conflicts because of the old master. I pushed again and made a new
mp, there should be a new link

On Thu, Aug 30, 2018, 02:12  Christian Ehrhardt  <
<email address hidden>> wrote:

> Hmm the MP here is "superseded" so you gave up and will try new with
> another approach?
>
> --
>
> https://code.launchpad.net/~ahasenack/ubuntu/+source/libcloud/+git/libcloud/+merge/353989
> You are the owner of ~ahasenack/ubuntu/+source/libcloud:more-dep8-fixes.
>
> Launchpad-Message-Rationale: Owner
> Launchpad-Message-For: ahasenack
> Launchpad-Notification-Type: code-review
> Launchpad-Branch:
> ~ahasenack/ubuntu/+source/libcloud/+git/libcloud:more-dep8-fixes
>

[Andreas Hasenack (ahasenack)]

This is the correct one, and it shows up in the queue:
https://code.launchpad.net/~ahasenack/ubuntu/+source/libcloud/+git/libcloud/+merge/353991

On Thu, Aug 30, 2018, 06:34 Andreas Hasenack <email address hidden> wrote:

> It has conflicts because of the old master. I pushed again and made a new
> mp, there should be a new link
>
> On Thu, Aug 30, 2018, 02:12  Christian Ehrhardt  <
> <email address hidden>> wrote:
>
> > Hmm the MP here is "superseded" so you gave up and will try new with
> > another approach?
> >
> > --
> >
> >
> https://code.launchpad.net/~ahasenack/ubuntu/+source/libcloud/+git/libcloud/+merge/353989
> > You are the owner of ~ahasenack/ubuntu/+source/libcloud:more-dep8-fixes.
> >
> > Launchpad-Message-Rationale: Owner
> > Launchpad-Message-For: ahasenack
> > Launchpad-Notification-Type: code-review
> > Launchpad-Branch:
> > ~ahasenack/ubuntu/+source/libcloud/+git/libcloud:more-dep8-fixes
> >
>
> --
>
> https://code.launchpad.net/~ahasenack/ubuntu/+source/libcloud/+git/libcloud/+merge/353989
> You are the owner of ~ahasenack/ubuntu/+source/libcloud:more-dep8-fixes.
>
> Launchpad-Message-Rationale: Owner
> Launchpad-Message-For: ahasenack
> Launchpad-Notification-Type: code-review
> Launchpad-Branch:
> ~ahasenack/ubuntu/+source/libcloud/+git/libcloud:more-dep8-fixes
>

Unmerged commits

4d77dd0... by Andreas Hasenack on 2018-08-29

changelog

3151ed4... by Andreas Hasenack on 2018-08-29

  * d/p/convert-object-size.patch: Convert object_size to string before
    adding it to a header.

diff --git a/debian/changelog b/debian/changelog
index 21094b4..c96577e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+<<<<<<< debian/changelog
+=======
+libcloud (2.3.0-1ubuntu2) cosmic; urgency=medium
+
+  * d/p/convert-object-size.patch: Convert object_size to string before
+    adding it to a header.
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 29 Aug 2018 10:10:47 -0300
+
+>>>>>>> debian/changelog
 libcloud (2.3.0-1ubuntu1) cosmic; urgency=medium
 
   * Address some python 3.7 issues (LP: #1788931):
diff --git a/debian/patches/convert-object-size.patch b/debian/patches/convert-object-size.patch
new file mode 100644
index 0000000..bf2813c
--- /dev/null
+++ b/debian/patches/convert-object-size.patch
@@ -0,0 +1,29 @@
+Description: Convert object_size to string before adding it to a header.
+ Since python-requests 2.11
+ (see https://github.com/requests/requests/issues/3477), integer values
+ in headers are no longer automatically converted to strings, so we need
+ to do it ourselves.
+ .
+ This is the same change that was done a couple of lines above for the
+ Content-Length header in commit 28a559042.
+ .
+ Signed-off-by: Quentin Pradet <[e-mail]>
+Author: Andreas Hasenack <[e-mail]>
+Bug: https://github.com/apache/libcloud/pull/1237
+Applied-Upstream: https://github.com/apache/libcloud/commit/e77580d8e0bfacf95e68210448186af4b9109025
+Last-Update: 2018-08-29
+---
+ libcloud/storage/drivers/azure_blobs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libcloud/storage/drivers/azure_blobs.py
++++ b/libcloud/storage/drivers/azure_blobs.py
+@@ -865,7 +865,7 @@
+ 
+         if blob_type == 'PageBlob':
+             headers['Content-Length'] = str('0')
+-            headers['x-ms-blob-content-length'] = object_size
++            headers['x-ms-blob-content-length'] = str(object_size)
+ 
+         return headers
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b272d4c..25f5cee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,6 @@
 remove-async-due-py37.patch
 handle-http_proxy-in-tests.patch
+<<<<<<< debian/patches/series
+=======
+convert-object-size.patch
+>>>>>>> debian/patches/series