openstack/deb-python-openstacksdk
Code Issues Proposed changes

Merge "Raise NotFoundException for 404s"

Browse Source
This commit is contained in:
Jenkins
2015-03-22 22:25:44 +00:00
committed by Gerrit Code Review
parent 531658af6f 3a0c7fd665
commit 8ef55adddf
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openstack/exceptions.py
View File

@@ -75,6 +75,11 @@ class HttpException(SDKException):
return self.__unicode__()
class NotFoundException(HttpException):
"""HTTP 404 Not Found."""
pass
class MethodNotSupported(SDKException):
"""The resource does not support this operation type."""
pass

2
openstack/tests/test_transport.py
View File

@@ -305,7 +305,7 @@ class TestTransport(base.TestTransportBase):
mock_req.get(self.TEST_URL, status_code=status)
exc = self.assertRaises(exceptions.HttpException, xport.get,
exc = self.assertRaises(exceptions.NotFoundException, xport.get,
self.TEST_URL)
self.assertEqual(status, exc.status_code)

13
openstack/transport.py
View File

@@ -262,10 +262,15 @@ class Transport(requests.Session):
try:
resp.raise_for_status()
except requests.RequestException as e:
raise exceptions.HttpException(
six.text_type(e),
details=self._parse_error_response(resp),
status_code=resp.status_code)
if resp.status_code == 404:
exc_type = exceptions.NotFoundException
else:
exc_type = exceptions.HttpException
raise exc_type(six.text_type(e),
details=self._parse_error_response(resp),
status_code=resp.status_code)
if accept == JSON:
try:
resp.body = resp.json()