Merge "Cast image_id to string before calling urllib.quote"

This commit is contained in:
Jenkins
2013-08-09 20:34:10 +00:00
committed by Gerrit Code Review
2 changed files with 13 additions and 2 deletions
+2 -2
View File
@@ -111,7 +111,7 @@ class ImageManager(base.Manager):
image_id = base.getid(image)
resp, body = self.api.raw_request('HEAD', '/v1/images/%s'
% urllib.quote(image_id))
% urllib.quote(str(image_id)))
meta = self._image_meta_from_headers(dict(resp.getheaders()))
return Image(self, meta)
@@ -124,7 +124,7 @@ class ImageManager(base.Manager):
"""
image_id = base.getid(image)
resp, body = self.api.raw_request('GET', '/v1/images/%s'
% urllib.quote(image_id))
% urllib.quote(str(image_id)))
checksum = resp.getheader('x-image-meta-checksum', None)
if do_checksum and checksum is not None:
body.set_checksum(checksum)