diff options
author | Aanand Prasad <aanand.prasad@gmail.com> | 2016-07-13 17:41:59 -0400 |
---|---|---|
committer | Aanand Prasad <aanand.prasad@gmail.com> | 2016-07-13 17:41:59 -0400 |
commit | 69832627f89bfc7810aebbe6560a1d8f8d19feb4 (patch) | |
tree | b0d39ac21f5dc375ab755b40ce8fa37dbea9726e | |
parent | 9fb2caecb9e58b287fc56f84a8135848e30e1e01 (diff) | |
download | docker-py-69832627f89bfc7810aebbe6560a1d8f8d19feb4.tar.gz |
Rename read_iter() to frames_iter()
This makes it more clearly high-level and distinct from the raw
data-reading functions
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
-rw-r--r-- | docker/client.py | 6 | ||||
-rw-r--r-- | docker/utils/socket.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/client.py b/docker/client.py index e131829..6ca9e57 100644 --- a/docker/client.py +++ b/docker/client.py @@ -29,7 +29,7 @@ from .ssladapter import ssladapter from .tls import TLSConfig from .transport import UnixAdapter from .utils import utils, check_resource, update_headers, kwargs_from_env -from .utils.socket import read_iter +from .utils.socket import frames_iter try: from .transport import NpipeAdapter except ImportError: @@ -310,9 +310,9 @@ class Client( socket = self._get_raw_response_socket(response) if stream: - return read_iter(socket) + return frames_iter(socket) else: - return six.binary_type().join(read_iter(socket)) + return six.binary_type().join(frames_iter(socket)) def _disable_socket_timeout(self, socket): """ Depending on the combination of python version and whether we're diff --git a/docker/utils/socket.py b/docker/utils/socket.py index fb099b3..610271d 100644 --- a/docker/utils/socket.py +++ b/docker/utils/socket.py @@ -57,7 +57,7 @@ def next_frame_size(socket): return actual -def read_iter(socket): +def frames_iter(socket): """ Returns a generator of frames read from socket """ |