diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2016-03-01 11:17:04 -0800 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2016-03-01 11:17:04 -0800 |
| commit | 4e67d4d9bfd310427e332520efa4d17c929c99cf (patch) | |
| tree | 397e5e6c874c602ab52356813f947dc9cf96287a | |
| parent | 81d8caaf36159bf1accd86eab2e157bf8dd071a9 (diff) | |
| parent | 08629f3b8ed75cfaecac5329cacba9659295c375 (diff) | |
| download | docker-py-4e67d4d9bfd310427e332520efa4d17c929c99cf.tar.gz | |
Merge pull request #968 from atopuzov/decode_on_push_and_pull
Use decode on push and pull operations.
| -rw-r--r-- | docker/api/image.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/api/image.py b/docker/api/image.py index 8493b38..3e66347 100644 --- a/docker/api/image.py +++ b/docker/api/image.py @@ -148,7 +148,7 @@ class ImageApiMixin(object): self._raise_for_status(res) def pull(self, repository, tag=None, stream=False, - insecure_registry=False, auth_config=None): + insecure_registry=False, auth_config=None, decode=False): if insecure_registry: warnings.warn( INSECURE_REGISTRY_DEPRECATION_WARNING.format('pull()'), @@ -200,12 +200,12 @@ class ImageApiMixin(object): self._raise_for_status(response) if stream: - return self._stream_helper(response) + return self._stream_helper(response, decode=decode) return self._result(response) def push(self, repository, tag=None, stream=False, - insecure_registry=False): + insecure_registry=False, decode=False): if insecure_registry: warnings.warn( INSECURE_REGISTRY_DEPRECATION_WARNING.format('push()'), @@ -241,7 +241,7 @@ class ImageApiMixin(object): self._raise_for_status(response) if stream: - return self._stream_helper(response) + return self._stream_helper(response, decode=decode) return self._result(response) |