StackOps
diff --git a/‎glanceclient/v1/images.py‎
Lines changed: 7 additions & 3 deletions b/‎glanceclient/v1/images.py‎
Lines changed: 7 additions & 3 deletions
@@ -91,13 +91,16 @@ def _format_image_meta_for_user(meta):
                     pass
         return meta
 
-    def get(self, image_id):
+    def get(self, image):
         """Get the metadata for a specific image.
 
         :param image: image object or id to look up
         :rtype: :class:`Image`
         """
-        resp, body = self.api.raw_request('HEAD', '/v1/images/%s' % image_id)
+
+        image_id = base.getid(image)
+        resp, body = self.api.raw_request('HEAD', '/v1/images/%s'
+                                          % urllib.quote(image_id))
         meta = self._image_meta_from_headers(dict(resp.getheaders()))
         return Image(self, meta)
 
@@ -109,7 +112,8 @@ def data(self, image, do_checksum=True):
         :rtype: iterable containing image data
         """
         image_id = base.getid(image)
-        resp, body = self.api.raw_request('GET', '/v1/images/%s' % image_id)
+        resp, body = self.api.raw_request('GET', '/v1/images/%s'
+                                          % urllib.quote(image_id))
         checksum = resp.getheader('x-image-meta-checksum', None)
         if do_checksum and checksum is not None:
             return utils.integrity_iter(body, checksum)