diff options
author | Joffrey F <joffrey@docker.com> | 2015-06-16 15:17:40 -0700 |
---|---|---|
committer | Joffrey F <joffrey@docker.com> | 2015-06-18 20:38:52 +0200 |
commit | 26531f1f8d77bd99bd269639163fd0d60efdea9f (patch) | |
tree | 086073caa2b1162f236952cefa3abb4d6d8c1c5a | |
parent | 38a6651ede2f380209646cd50c8034dd76f27886 (diff) | |
download | docker-py-26531f1f8d77bd99bd269639163fd0d60efdea9f.tar.gz |
Enforce consistent style for push and pull methods
-rw-r--r-- | docker/client.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/docker/client.py b/docker/client.py index e602250..c73e560 100644 --- a/docker/client.py +++ b/docker/client.py @@ -912,15 +912,17 @@ class Client(requests.Session): else: headers['X-Registry-Auth'] = auth.encode_header(auth_config) - response = self._post(self._url('/images/create'), params=params, - headers=headers, stream=stream, timeout=None) + response = self._post( + self._url('/images/create'), params=params, headers=headers, + stream=stream, timeout=None + ) self._raise_for_status(response) if stream: return self._stream_helper(response) - else: - return self._result(response) + + return self._result(response) def push(self, repository, tag=None, stream=False, insecure_registry=False): @@ -948,15 +950,16 @@ class Client(requests.Session): if authcfg: headers['X-Registry-Auth'] = auth.encode_header(authcfg) - response = self._post_json(u, None, headers=headers, - stream=stream, params=params) - else: - response = self._post_json(u, None, stream=stream, params=params) + response = self._post_json( + u, None, headers=headers, stream=stream, params=params + ) self._raise_for_status(response) - return stream and self._stream_helper(response) \ - or self._result(response) + if stream: + return self._stream_helper(response) + + return self._result(response) @check_resource def remove_container(self, container, v=False, link=False, force=False): |