diff options
| author | Joffrey F <joffrey@docker.com> | 2016-10-11 17:19:20 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2016-10-12 13:23:27 -0700 |
| commit | c76ec15d9b58299aabb55b2c6632f08eb51d520c (patch) | |
| tree | 3e1e63cfd425ac0ec8361dd159d44670bd85ae29 /docker/client.py | |
| parent | 6f7392ea09751be65821a0d539f6834e3f6ce31d (diff) | |
| download | docker-py-npipe-advanced.tar.gz | |
Several fixes to npipe supportnpipe-advanced
- Fix _get_raw_response_socket to always return the NpipeSocket object
- Override NpipeHTTPConnectionPool._get_conn to avoid crash in urllib3
- Fix NpipeSocket.recv_into for Python 2
- Do not call select() on NpipeSocket objects
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/client.py')
| -rw-r--r-- | docker/client.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/client.py b/docker/client.py index aba066b..aec78c8 100644 --- a/docker/client.py +++ b/docker/client.py @@ -220,7 +220,9 @@ class Client( def _get_raw_response_socket(self, response): self._raise_for_status(response) - if six.PY3: + if self.base_url == "http+docker://localnpipe": + sock = response.raw._fp.fp.raw.sock + elif six.PY3: sock = response.raw._fp.fp.raw if self.base_url.startswith("https://"): sock = sock._sock |