Cleanup

Signed-off-by: Joffrey F <[email protected]>

Author: shin-

docker/api/client.py

@@ -360,7 +360,6 @@ def _stream_raw_result(self, response, chunk_size=1, decode=True):
 
     def _read_from_socket(self, response, stream, tty=False):
         socket = self._get_raw_response_socket(response)
-        self._disable_socket_timeout(socket)
 
         gen = None
         if tty is False:

docker/utils/socket.py

@@ -23,11 +23,7 @@ def read(socket, n=4096):
 
     recoverable_errors = (errno.EINTR, errno.EDEADLK, errno.EWOULDBLOCK)
 
-    if six.PY3:
-        if isinstance(socket, getattr(pysocket, 'SocketIO')):
-            socket = socket._sock
-
-        if not isinstance(socket, NpipeSocket):
+    if six.PY3 and not isinstance(socket, NpipeSocket):
             select.select([socket], [], [])
 
     try: