Merge "Drop Glance Client"

glance/common/client.py

@@ -86,76 +86,6 @@ def wrapped(self, method, url, body, headers):
     return wrapped
 
 
-class ImageBodyIterator(object):
-
-    """
-    A class that acts as an iterator over an image file's
-    chunks of data.  This is returned as part of the result
-    tuple from `glance.client.Client.get_image`
-    """
-
-    def __init__(self, source):
-        """
-        Constructs the object from a readable image source
-        (such as an HTTPResponse or file-like object)
-        """
-        self.source = source
-
-    def __iter__(self):
-        """
-        Exposes an iterator over the chunks of data in the
-        image file.
-        """
-        while True:
-            chunk = self.source.read(CHUNKSIZE)
-            if chunk:
-                yield chunk
-            else:
-                break
-
-
-class SendFileIterator:
-    """
-    Emulate iterator pattern over sendfile, in order to allow
-    send progress be followed by wrapping the iteration.
-    """
-    def __init__(self, connection, body):
-        self.connection = connection
-        self.body = body
-        self.offset = 0
-        self.sending = True
-
-    def __iter__(self):
-        class OfLength:
-            def __init__(self, len):
-                self.len = len
-
-            def __len__(self):
-                return self.len
-
-        while self.sending:
-            try:
-                sent = sendfile.sendfile(self.connection.sock.fileno(),
-                                         self.body.fileno(),
-                                         self.offset,
-                                         CHUNKSIZE)
-            except OSError as e:
-                # suprisingly, sendfile may fail transiently instead of
-                # blocking, in which case we select on the socket in order
-                # to wait on its return to a writeable state before resuming
-                # the send loop
-                if e.errno in (errno.EAGAIN, errno.EBUSY):
-                    wlist = [self.connection.sock.fileno()]
-                    rfds, wfds, efds = select.select([], wlist, [])
-                    if wfds:
-                        continue
-                raise
-
-            self.sending = (sent != 0)
-            self.offset += sent
-            yield OfLength(sent)
-
-
 class HTTPSClientAuthConnection(httplib.HTTPSConnection):
     """
     Class to make a HTTPS connection, with support for