Modify return values in ApiException

Author: Andrew Sprague

docs/iland.rst

@@ -8,39 +8,39 @@ iland.api module
 ----------------
 
 .. automodule:: iland.api
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 iland.constant module
 ---------------------
 
 .. automodule:: iland.constant
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 iland.exception module
 ----------------------
 
 .. automodule:: iland.exception
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 iland.log module
 ----------------
 
 .. automodule:: iland.log
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 
 Module contents
 ---------------
 
 .. automodule:: iland
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:

iland/api.py

@@ -7,9 +7,9 @@
 
 import requests
 
-from .constant import BASE_URL, ACCESS_URL, REFRESH_URL
-from .log import LOG
+from .constant import ACCESS_URL, BASE_URL, REFRESH_URL
 from .exception import ApiException, UnauthorizedException
+from .log import LOG
 
 
 class Api(object):

iland/exception.py

@@ -9,17 +9,17 @@ class ApiException(Exception):
     @property
     def error(self):
         """Returns the first argument used to construct this error."""
-        return self.args[0]
+        return self.args[0].get('type')
 
     @property
     def message(self):
         """Returns the second argument used to construct this error."""
-        return self.args[1]
+        return self.args[0].get('message')
 
     @property
     def detail_message(self):
         """Returns the third argument used to construct this error."""
-        return self.args[2]
+        return self.args[0].get('detail_message')
 
 
 class UnauthorizedException(ApiException):

tests/test_iland.py

@@ -6,10 +6,10 @@
 import time
 import unittest
 
-import requests_mock
-
 import iland
 
+import requests_mock
+
 BASE_URL = 'http://example.com/ecs'
 
 VALID_TOKEN_PAYLOAD = {'expires_in': 12,

tests/test_iland_int.py

@@ -143,6 +143,17 @@ def test_api_errors(self):
         with self.assertRaises(ApiException):
             self._api.get('/doesnotexist')
 
+    def test_api_exception_properties(self):
+        with self.assertRaises(ApiException) as e:
+            self._api.get('/doesnotexist')
+        api_exception = e.exception
+        self.assertEqual(api_exception.error,
+                         'NotFoundError')
+        self.assertEqual(api_exception.message,
+                         'The specified resource does not exist.')
+        self.assertIn('Could not find resource for full path',
+                      api_exception.detail_message)
+
     @unittest.skipIf(not PROXIES, "No proxies defined")
     def test_get_with_proxy(self):
         self._api._proxies = PROXIES