summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-06-16 15:20:40 -0700
committerJoffrey F <joffrey@docker.com>2015-06-16 15:20:40 -0700
commita1033b37211c6afe480c9e5db9c32ae47b67ca40 (patch)
tree573ccf05a0ce707e3a7601d0af469284ecd0231d
parent164593e0490448fc15fc3c1f52f6abc05b9a2602 (diff)
parent7d82bcb4290745fc1e98b0a5f140945561b11acf (diff)
downloaddocker-py-a1033b37211c6afe480c9e5db9c32ae47b67ca40.tar.gz
Merge branch 'bcicen-add-raise-for-status-to-push-pull-methods' into 1.3.0-dev
-rw-r--r--docker/client.py27
1 files changed, 17 insertions, 10 deletions
diff --git a/docker/client.py b/docker/client.py
index dc76f5d..89e2841 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -911,13 +911,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):
@@ -945,13 +949,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)
+
+ if stream:
+ return self._stream_helper(response)
- return stream and self._stream_helper(response) \
- or self._result(response)
+ return self._result(response)
@check_resource
def remove_container(self, container, v=False, link=False, force=False):