summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAanand Prasad <aanand.prasad@gmail.com>2015-07-20 11:46:21 +0100
committerAanand Prasad <aanand.prasad@gmail.com>2015-07-20 11:46:21 +0100
commit4cfb15737db5192987276860cb0dc75812d8e4f2 (patch)
tree7fc92cce86583dd16827eb0019d6ff56be53c2fd
parent946eb964adceef7f531ca4f30c4bfe973566811a (diff)
parent2e546f7e26fec006dd18119d4857580ec9ccd540 (diff)
downloaddocker-py-4cfb15737db5192987276860cb0dc75812d8e4f2.tar.gz
Merge pull request #676 from larsks/feature/notfound-on-404
return NotFound on 404 errors
-rw-r--r--docker/clientbase.py2
-rw-r--r--docker/errors.py4
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/clientbase.py b/docker/clientbase.py
index c81ee0c..ce52ffa 100644
--- a/docker/clientbase.py
+++ b/docker/clientbase.py
@@ -99,6 +99,8 @@ class ClientBase(requests.Session):
try:
response.raise_for_status()
except requests.exceptions.HTTPError as e:
+ if e.response.status_code == 404:
+ raise errors.NotFound(e, response, explanation=explanation)
raise errors.APIError(e, response, explanation=explanation)
def _result(self, response, json=False, binary=False):
diff --git a/docker/errors.py b/docker/errors.py
index d15e332..066406a 100644
--- a/docker/errors.py
+++ b/docker/errors.py
@@ -53,6 +53,10 @@ class DockerException(Exception):
pass
+class NotFound(APIError):
+ pass
+
+
class InvalidVersion(DockerException):
pass