diff options
| author | Louis Taylor <kragniz@gmail.com> | 2014-11-01 20:49:03 +0000 |
|---|---|---|
| committer | Louis Taylor <kragniz@gmail.com> | 2015-01-04 20:52:00 +0000 |
| commit | df02ee8e2a10d2f37a9c013dec157c88b8dce49d (patch) | |
| tree | 6adf239757b8880c0d6d0e5b70e110d5625442ae /glanceclient/v1 | |
| parent | 7ce1ff9325be702384d728ad6a94f597680e1707 (diff) | |
| download | python-glanceclient-df02ee8e2a10d2f37a9c013dec157c88b8dce49d.tar.gz | |
Fix Requests breaking download progress bar
The move to the requests library (dbb242b) broke the progress bar during
downloading an image with --progress enabled, due to requests returning
a generator, which has no __len__ function. This patch adds an iterable
wrapper which provides the length, sourced from Content-Length headers.
Closes-Bug: #1384664
Change-Id: I48598a824396bc6e7cba69eb3ce32e7c8f30a18a
Diffstat (limited to 'glanceclient/v1')
| -rw-r--r-- | glanceclient/v1/images.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/glanceclient/v1/images.py b/glanceclient/v1/images.py index 87060c2..e3a6e69 100644 --- a/glanceclient/v1/images.py +++ b/glanceclient/v1/images.py @@ -140,14 +140,15 @@ class ImageManager(base.ManagerWithFind): image_id = base.getid(image) resp, body = self.client.get('/v1/images/%s' % urlparse.quote(str(image_id))) + content_length = int(resp.headers.get('content-length', 0)) checksum = resp.headers.get('x-image-meta-checksum', None) if do_checksum and checksum is not None: - return utils.integrity_iter(body, checksum) + body = utils.integrity_iter(body, checksum) return_request_id = kwargs.get('return_req_id', None) if return_request_id is not None: return_request_id.append(resp.headers.get(OS_REQ_ID_HDR, None)) - return body + return utils.IterableWithLength(body, content_length) def list(self, **kwargs): """Get a list of images. |