diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2014-10-30 14:51:50 +0100 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2014-10-30 14:51:50 +0100 |
| commit | 10c67bde5182cf6c81d541f4280453e646ae7816 (patch) | |
| tree | d1e550f5b165b302983abe8a92854d73de4e5d8f | |
| parent | 91ba1a942608023a16d0bca81356ae3c8898a837 (diff) | |
| parent | 9d58b20b9d54050df04c7d212f571a2f19be3a0e (diff) | |
| download | docker-py-10c67bde5182cf6c81d541f4280453e646ae7816.tar.gz | |
Merge pull request #381 from micahhausler/py3socket
Fixed socket for PY3 - Fixes #342
| -rw-r--r-- | .dockerignore | 15 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | docker/client.py | 7 |
3 files changed, 25 insertions, 1 deletions
diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..ababae3 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,15 @@ +.git/ + +build +dist +*.egg-info +*.egg/ +*.pyc +*.swp + +.tox +.coverage +html/* + +# Compiled Documentation +site/ @@ -11,3 +11,7 @@ html/* # Compiled Documentation site/ + +env/ +venv/ +.idea/ diff --git a/docker/client.py b/docker/client.py index f8252b8..e70c0a4 100644 --- a/docker/client.py +++ b/docker/client.py @@ -277,7 +277,12 @@ class Client(requests.Session): def _stream_helper(self, response): """Generator for data coming from a chunked-encoded HTTP response.""" - socket_fp = socket_obj(_sock=self._get_raw_response_socket(response)) + if six.PY3: + socket_fp = self._get_raw_response_socket(response) + else: + socket_fp = socket_obj( + _sock=self._get_raw_response_socket(response) + ) socket_fp.setblocking(1) socket = socket_fp.makefile() while True: |