openstack/python-glanceclient
Code Issues Proposed changes

Merge "Auto-generated squash commit"

Browse Source
This commit is contained in:
Jenkins
2016-02-12 00:10:58 +00:00
committed by Gerrit Code Review
parent a49ce80db6 e91d8ec4b8
commit c58b4cc984
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glanceclient/tests/unit/test_shell.py
View File

@@ -272,7 +272,7 @@ class ShellTest(testutils.TestCase):
glance_shell = openstack_shell.OpenStackImagesShell() glance_shell = openstack_shell.OpenStackImagesShell()
glance_shell.main(args.split()) glance_shell.main(args.split())
# NOTE(flaper87): this currently calls auth twice since it'll # NOTE(flaper87): this currently calls auth twice since it'll
# authenticate to get the verison list *and* to excuted the command. # authenticate to get the version list *and* to execute the command.
# This is not the ideal behavior and it should be fixed in a follow # This is not the ideal behavior and it should be fixed in a follow
# up patch. # up patch.

4
glanceclient/v2/images.py
View File

@@ -189,7 +189,7 @@ class Controller(object):
:param image_id: ID of the image to download. :param image_id: ID of the image to download.
:param do_checksum: Enable/disable checksum validation. :param do_checksum: Enable/disable checksum validation.
:returns: An interable body or None :returns: An iterable body or None
""" """
url = '/v2/images/%s/file' % image_id url = '/v2/images/%s/file' % image_id
resp, body = self.http_client.get(url) resp, body = self.http_client.get(url)
@@ -209,7 +209,7 @@ class Controller(object):
:param image_id: ID of the image to upload data for. :param image_id: ID of the image to upload data for.
:param image_data: File-like object supplying the data to upload. :param image_data: File-like object supplying the data to upload.
:param image_size: Unused - present for backwards compatability :param image_size: Unused - present for backwards compatibility
""" """
url = '/v2/images/%s/file' % image_id url = '/v2/images/%s/file' % image_id
hdrs = {'Content-Type': 'application/octet-stream'} hdrs = {'Content-Type': 'application/octet-stream'}