From e134e896825c443370ea6575f63fa36b24a62b3b Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Thu, 14 Aug 2014 09:46:17 +0200 Subject: [PATCH 1/2] Wrap response socket for platform compatibility. --- docker/client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/client.py b/docker/client.py index 49e85dd49b..3358b33a78 100644 --- a/docker/client.py +++ b/docker/client.py @@ -17,6 +17,7 @@ import re import shlex import struct +from socket import socket as socket_wrapper import warnings import requests @@ -264,7 +265,7 @@ def _get_raw_response_socket(self, response): def _stream_helper(self, response): """Generator for data coming from a chunked-encoded HTTP response.""" - socket_fp = self._get_raw_response_socket(response) + socket_fp = socket_wrapper(_sock=self._get_raw_response_socket(response)) socket_fp.setblocking(1) socket = socket_fp.makefile() while True: From b5f08141e60b9d0cf3f711830df34584ce195a31 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Tue, 9 Sep 2014 08:52:02 +0200 Subject: [PATCH 2/2] Renamed wrapper. --- docker/client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/client.py b/docker/client.py index 3358b33a78..1ff43cc4ec 100644 --- a/docker/client.py +++ b/docker/client.py @@ -17,7 +17,7 @@ import re import shlex import struct -from socket import socket as socket_wrapper +from socket import socket as socket_obj import warnings import requests @@ -265,7 +265,7 @@ def _get_raw_response_socket(self, response): def _stream_helper(self, response): """Generator for data coming from a chunked-encoded HTTP response.""" - socket_fp = socket_wrapper(_sock=self._get_raw_response_socket(response)) + socket_fp = socket_obj(_sock=self._get_raw_response_socket(response)) socket_fp.setblocking(1) socket = socket_fp.makefile() while True: