Modified imports to prevent circular dependency. (#40)

Author: Kevin Hellemun

bunq/sdk/model/core.py

@@ -1,5 +1,4 @@
 from bunq.sdk import client
-from bunq.sdk import context
 from bunq.sdk.json import converter
 
 
@@ -269,7 +268,7 @@ def server_public_key(self):
     @classmethod
     def create(cls, api_context, public_key_string):
         """
-        :type api_context: context.ApiContext
+        :type api_context: bunq.sdk.context.ApiContext
         :type public_key_string: str
 
         :rtype: client.BunqResponse[Installation]
@@ -353,7 +352,7 @@ def user_company(self):
     @classmethod
     def create(cls, api_context):
         """
-        :type api_context: context.ApiContext
+        :type api_context: bunq.sdk.context.ApiContext
 
         :rtype: client.BunqResponse[SessionServer]
         """

tests/bunq_test.py

@@ -1,14 +1,13 @@
 import os
 import unittest
 
-from tests.config import Config
-from bunq.sdk.context import ApiContext
-from bunq.sdk.context import ApiEnvironmentType
+from tests import config
+from bunq.sdk import context
 
 
 class BunqSdkTestCase(unittest.TestCase):
     # Config values
-    _API_KEY = Config.get_api_key()
+    _API_KEY = config.Config.get_api_key()
 
     # Name of bunq config file
     _FILENAME_BUNQ_CONFIG = "/bunq-test.conf"
@@ -20,21 +19,21 @@ class BunqSdkTestCase(unittest.TestCase):
     def _get_api_context(cls):
         """
         Calls IsSessionActive to check if the session token is still active
-        and returns the ApiContext.
+        and returns the context.ApiContext.
 
         Catches ApiException if the session is inactive.
         Catches BunqException if the conf file does not exist.
 
-        :rtype: ApiContext
+        :rtype: context.ApiContext
         """
 
         filename_bunq_config_full = (cls._get_directory_test_root() +
                                      cls._FILENAME_BUNQ_CONFIG)
 
         try:
-            api_context = ApiContext.restore(filename_bunq_config_full)
+            api_context = context.ApiContext.restore(filename_bunq_config_full)
         except FileNotFoundError:
-            api_context = ApiContext(ApiEnvironmentType.SANDBOX, cls._API_KEY,
+            api_context = context.ApiContext(context.ApiEnvironmentType.SANDBOX, cls._API_KEY,
                                      cls._DEVICE_DESCRIPTION, [])
         else:
             api_context.ensure_session_active()

tests/config.py

@@ -1,7 +1,7 @@
 import json
 import os
 
-from bunq.sdk.model.generated.object_ import Pointer
+from bunq.sdk.model.generated import object_
 
 
 class Config:
@@ -104,7 +104,7 @@ def get_pointer_counter_party_self(cls):
         alias = cls._get_config_file()[cls._FIELD_COUNTER_PARTY_SELF][
             cls._FIELD_ALIAS]
 
-        return Pointer(type_, alias)
+        return object_.Pointer(type_, alias)
 
     @classmethod
     def get_pointer_counter_party_other(cls):
@@ -117,7 +117,7 @@ def get_pointer_counter_party_other(cls):
         alias = cls._get_config_file()[cls._FIELD_COUNTER_PARTY_OTHER][
             cls._FIELD_ALIAS]
 
-        return Pointer(type_, alias)
+        return object_.Pointer(type_, alias)
 
     @classmethod
     def get_permitted_ips(cls):

tests/test_pagination_scenario.py

@@ -3,7 +3,7 @@
 from bunq.sdk.model.generated import endpoint
 from bunq.sdk.model.generated import object_
 from tests.bunq_test import BunqSdkTestCase
-from tests.bunq_test import Config
+from tests.config import Config
 
 
 class TestPaginationScenario(BunqSdkTestCase):