Updated the python SDK exceptions to match that of the other SDKs.

angelomelonas · angelomelonas · commit 5bc3d5dc8371 · 2019-09-12T22:00:24.000+02:00
diff --git a/README.md b/README.md
@@ -137,4 +137,4 @@ located in [test](/tests)
 
 ## Exceptions
 The SDK can raise multiple exceptions. For an overview of these exceptions please
-take a look at [EXCEPTIONS.md](./EXCEPTIONS.md)
+take a look at [EXCEPTIONS.md](./bunq/sdk/exception/EXCEPTIONS.md)
diff --git a/bunq/sdk/context/api_context.py b/bunq/sdk/context/api_context.py
@@ -5,7 +5,7 @@
 from bunq.sdk.context.api_environment_type import ApiEnvironmentType
 from bunq.sdk.context.installation_context import InstallationContext
 from bunq.sdk.context.session_context import SessionContext
-from bunq.sdk.exception.exception import BunqException
+from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.json import converter
 from bunq.sdk.model import core
 from bunq.sdk.model.generated import endpoint
diff --git a/bunq/sdk/context/bunq_context.py b/bunq/sdk/context/bunq_context.py
@@ -1,6 +1,6 @@
 from bunq.sdk.context.api_context import ApiContext
 from bunq.sdk.context.user_context import UserContext
-from bunq.sdk.exception.exception import BunqException
+from bunq.sdk.exception.bunq_exception import BunqException
 
 
 class BunqContext(object):
diff --git a/bunq/sdk/context/user_context.py b/bunq/sdk/context/user_context.py
@@ -1,4 +1,4 @@
-from bunq.sdk.exception.exception import BunqException
+from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.model import core
 from bunq.sdk.model.generated import endpoint
 
diff --git a/bunq/sdk/exception/EXCEPTIONS.md b/bunq/sdk/exception/EXCEPTIONS.md
@@ -53,7 +53,7 @@ Because we raise different exceptions for each error, you can catch an error
 if you expect it to be raised.
 
 ```python
-from bunq.sdk.exception.exception import BadRequestException
+from bunq.sdk.exception.bad_request_exception import BadRequestException
 from bunq.sdk.context.api_context import ApiEnvironmentType, ApiContext
 
 API_KEY = "Some invalid API key"
diff --git a/bunq/sdk/exception/api_exception.py b/bunq/sdk/exception/api_exception.py
@@ -35,40 +35,3 @@ def response_id(self):
         """
 
         return self._response_id
-
-
-class BunqException(Exception):
-    def __init__(self, message):
-        super(BunqException, self).__init__(message)
-
-
-class UnknownApiErrorException(ApiException):
-    pass
-
-
-class BadRequestException(ApiException):
-    pass
-
-
-class UnauthorizedException(ApiException):
-    pass
-
-
-class ForbiddenException(ApiException):
-    pass
-
-
-class NotFoundException(ApiException):
-    pass
-
-
-class MethodNotAllowedException(ApiException):
-    pass
-
-
-class TooManyRequestsException(ApiException):
-    pass
-
-
-class PleaseContactBunqException(ApiException):
-    pass
diff --git a/bunq/sdk/exception/bad_request_exception.py b/bunq/sdk/exception/bad_request_exception.py
@@ -0,0 +1,5 @@
+from bunq.sdk.exception.api_exception import ApiException
+
+
+class BadRequestException(ApiException):
+    pass
diff --git a/bunq/sdk/exception/bunq_exception.py b/bunq/sdk/exception/bunq_exception.py
@@ -0,0 +1,3 @@
+class BunqException(Exception):
+    def __init__(self, message):
+        super(BunqException, self).__init__(message)
diff --git a/bunq/sdk/exception/exception_factory.py b/bunq/sdk/exception/exception_factory.py
@@ -1,12 +1,11 @@
-from bunq.sdk.exception.exception import BadRequestException
-from bunq.sdk.exception.exception import UnauthorizedException
-from bunq.sdk.exception.exception import ForbiddenException
-from bunq.sdk.exception.exception import NotFoundException
-from bunq.sdk.exception.exception import MethodNotAllowedException
-from bunq.sdk.exception.exception import TooManyRequestsException
-from bunq.sdk.exception.exception import PleaseContactBunqException
-from bunq.sdk.exception.exception import UnknownApiErrorException
-from bunq.sdk.exception.exception import ApiException
+from bunq.sdk.exception.bad_request_exception import BadRequestException
+from bunq.sdk.exception.forbidden_exception import ForbiddenException
+from bunq.sdk.exception.method_not_allowed_exception import MethodNotAllowedException
+from bunq.sdk.exception.not_found_exception import NotFoundException
+from bunq.sdk.exception.please_contact_bunq_exception import PleaseContactBunqException
+from bunq.sdk.exception.too_many_requests_exception import TooManyRequestsException
+from bunq.sdk.exception.unauthorized_exception import UnauthorizedException
+from bunq.sdk.exception.unknown_api_error_exception import UnknownApiErrorException
 
 
 class ExceptionFactory:
diff --git a/bunq/sdk/exception/forbidden_exception.py b/bunq/sdk/exception/forbidden_exception.py
@@ -0,0 +1,5 @@
+from bunq.sdk.exception.api_exception import ApiException
+
+
+class ForbiddenException(ApiException):
+    pass
diff --git a/bunq/sdk/exception/method_not_allowed_exception.py b/bunq/sdk/exception/method_not_allowed_exception.py
@@ -0,0 +1,5 @@
+from bunq.sdk.exception.api_exception import ApiException
+
+
+class MethodNotAllowedException(ApiException):
+    pass
diff --git a/bunq/sdk/exception/not_found_exception.py b/bunq/sdk/exception/not_found_exception.py
@@ -0,0 +1,5 @@
+from bunq.sdk.exception.api_exception import ApiException
+
+
+class NotFoundException(ApiException):
+    pass
diff --git a/bunq/sdk/exception/please_contact_bunq_exception.py b/bunq/sdk/exception/please_contact_bunq_exception.py
@@ -0,0 +1,5 @@
+from bunq.sdk.exception.api_exception import ApiException
+
+
+class PleaseContactBunqException(ApiException):
+    pass
diff --git a/bunq/sdk/exception/too_many_requests_exception.py b/bunq/sdk/exception/too_many_requests_exception.py
@@ -0,0 +1,5 @@
+from bunq.sdk.exception.api_exception import ApiException
+
+
+class TooManyRequestsException(ApiException):
+    pass
diff --git a/bunq/sdk/exception/unauthorized_exception.py b/bunq/sdk/exception/unauthorized_exception.py
@@ -0,0 +1,5 @@
+from bunq.sdk.exception.api_exception import ApiException
+
+
+class UnauthorizedException(ApiException):
+    pass
diff --git a/bunq/sdk/exception/uncaught_exception_error.py b/bunq/sdk/exception/uncaught_exception_error.py
@@ -0,0 +1,5 @@
+from bunq.sdk.exception.api_exception import ApiException
+
+
+class UncaughtExceptionError(ApiException):
+    pass
diff --git a/bunq/sdk/exception/unknown_api_error_exception.py b/bunq/sdk/exception/unknown_api_error_exception.py
@@ -0,0 +1,5 @@
+from bunq.sdk.exception.api_exception import ApiException
+
+
+class UnknownApiErrorException(ApiException):
+    pass
diff --git a/bunq/sdk/http/pagination.py b/bunq/sdk/http/pagination.py
@@ -1,4 +1,4 @@
-from bunq.sdk.exception import exception
+from bunq.sdk.exception.bunq_exception import BunqException
 
 
 class Pagination(object):
@@ -45,7 +45,7 @@ def assert_has_previous_page(self):
         """
 
         if not self.has_previous_page():
-            raise exception.BunqException(self._ERROR_NO_PREVIOUS_PAGE)
+            raise BunqException(self._ERROR_NO_PREVIOUS_PAGE)
 
     def has_previous_page(self):
         """
@@ -101,7 +101,7 @@ def assert_has_next_page(self):
         """
 
         if self._next_id is None:
-            raise exception.BunqException(self._ERROR_NO_NEXT_PAGE)
+            raise BunqException(self._ERROR_NO_NEXT_PAGE)
 
     @property
     def _next_id(self):
diff --git a/bunq/sdk/json/adapters.py b/bunq/sdk/json/adapters.py
@@ -2,10 +2,9 @@
 import urllib.parse as urlparse
 
 from bunq import Pagination
-from bunq.sdk.http import api_client
 from bunq.sdk.context import api_context
+from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.security import security
-from bunq.sdk.exception.exception import BunqException
 from bunq.sdk.json import converter
 from bunq.sdk.model import core
 from bunq.sdk.model.generated import endpoint
diff --git a/bunq/sdk/json/converter.py b/bunq/sdk/json/converter.py
@@ -4,9 +4,9 @@
 import sys
 import warnings
 
-from bunq.sdk.exception import exception
-
 # Indentation size we use for the serialized JSON output
+from bunq.sdk.exception.bunq_exception import BunqException
+
 _JSON_INDENT = 4
 
 
@@ -345,7 +345,7 @@ def _str_to_type_from_member_module(cls, module_, string):
 
         error_message = cls._ERROR_COULD_NOT_FIND_CLASS.format(string)
 
-        raise exception.BunqException(error_message)
+        raise BunqException(error_message)
 
     @classmethod
     def _deserialize_value(cls, types, value):
diff --git a/bunq/sdk/model/core.py b/bunq/sdk/model/core.py
@@ -1,6 +1,6 @@
 from bunq import Pagination
 from bunq.sdk.context.bunq_context import BunqContext
-from bunq.sdk.exception.exception import BunqException
+from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.http import api_client
 from bunq.sdk.http.api_client import ApiClient
 from bunq.sdk.http.bunq_response import BunqResponse
diff --git a/bunq/sdk/model/device_server_internal.py b/bunq/sdk/model/device_server_internal.py
@@ -1,4 +1,4 @@
-from bunq.sdk.exception.exception import BunqException
+from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.http.api_client import ApiClient
 from bunq.sdk.json import converter
 from bunq.sdk.model.generated.endpoint import BunqResponseInt
diff --git a/bunq/sdk/model/generated/endpoint.py b/bunq/sdk/model/generated/endpoint.py
diff --git a/bunq/sdk/model/generated/object_.py b/bunq/sdk/model/generated/object_.py
diff --git a/bunq/sdk/util/util.py b/bunq/sdk/util/util.py
@@ -3,9 +3,9 @@
 
 import requests
 
+from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.http.api_client import ApiClient
 from bunq.sdk.context.api_context import ApiContext, ApiEnvironmentType
-from bunq.sdk.exception.exception import BunqException
 from bunq.sdk.model.generated import endpoint
 
 __UNIQUE_REQUEST_ID = "uniqueness-is-required"
diff --git a/examples b/examples
@@ -1 +1 @@
-Subproject commit 36c70dd9d6ca6eecfea868dde595d6243eb4971a
+Subproject commit 25530d7b14436778b8bd4b186c7bb2aeb0b0f9e3
diff --git a/tests/bunq_test.py b/tests/bunq_test.py
@@ -4,9 +4,9 @@
 
 from bunq.sdk.context import api_context
 from bunq.sdk.context.bunq_context import BunqContext
+from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.util import util
 from bunq.sdk.http.api_client import ApiClient
-from bunq.sdk.exception.exception import BunqException
 from bunq.sdk.model.generated import endpoint
 from bunq.sdk.model.generated import object_
 
diff --git a/tests/http/test_bad_request_with_response_id.py b/tests/http/test_bad_request_with_response_id.py
@@ -1,7 +1,7 @@
-from bunq.sdk.exception.exception import ApiException
+from bunq.sdk.context.bunq_context import BunqContext
+from bunq.sdk.exception.api_exception import ApiException
 from bunq.sdk.model.generated.endpoint import MonetaryAccountBank
 from tests.bunq_test import BunqSdkTestCase
-from bunq.sdk.context.api_context import BunqContext
 
 
 class TestPagination(BunqSdkTestCase):
diff --git a/tests/http/test_pagination.py b/tests/http/test_pagination.py
@@ -1,5 +1,5 @@
+from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.http import api_client
-from bunq.sdk.exception import exception
 from tests.bunq_test import BunqSdkTestCase
 
 
@@ -118,7 +118,7 @@ def access_url_params_previous_page():
             _ = pagination.url_params_previous_page
 
         self.assertFalse(pagination.has_previous_page())
-        self.assertRaises(exception.BunqException,
+        self.assertRaises(BunqException,
                           access_url_params_previous_page)
 
     def test_get_url_params_next_page_from_pagination_with_no_next_page(self):
@@ -129,4 +129,4 @@ def test_get_url_params_next_page_from_pagination_with_no_next_page(self):
         def access_url_params_next_page():
             _ = pagination.url_params_next_page
 
-        self.assertRaises(exception.BunqException, access_url_params_next_page)
+        self.assertRaises(BunqException, access_url_params_next_page)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from bunq.sdk.exception.exception import BunqException`
	`1`	`+from bunq.sdk.exception.bunq_exception import BunqException`
`2`	`2`	`from bunq.sdk.model import core`
`3`	`3`	`from bunq.sdk.model.generated import endpoint`
`4`	`4`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +from bunq.sdk.exception.api_exception import ApiException
++
++
 +class BadRequestException(ApiException):
 +    pass
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class BunqException(Exception):`
	`2`	`+ def __init__(self, message):`
	`3`	`+ super(BunqException, self).__init__(message)`