Intoduce API_PAYMENT_VERSION and API_PAYOUT_VERSION deprecate API_VERSION

Author: AlexandrosMor

Adyen/client.py

@@ -105,8 +105,10 @@ def _determine_api_url(self, platform, service, action):
         base_uri = settings.BASE_PAL_URL.format(platform)
         if service == "Recurring":
             api_version = settings.API_RECURRING_VERSION
-        else:
+        elif service == "Payout":
             api_version = settings.API_PAYOUT_VERSION
+        else:
+            api_version = settings.API_PAYMENT_VERSION
         return '/'.join([base_uri, service, api_version, action])
 
     def _determine_hpp_url(self, platform, action):

Adyen/settings.py

@@ -5,13 +5,9 @@
                                 ".adyenpayments.com/checkout"
 API_CHECKOUT_VERSION = "v40"
 API_CHECKOUT_UTILITY_VERSION = "v1"
-API_PAYOUT_VERSION = "v30"
 API_RECURRING_VERSION = "v25"
+API_PAYMENT_VERSION = "v30"
+API_PAYOUT_VERSION = "v30"
 
-
-@property
-def API_VERSION():
-    import warnings
-    warnings.warn("this constant is deprecated use API_PAYOUT_VERSION",
-                  DeprecationWarning)
-    return "v30"
+# Deprecated
+API_VERSION = "v30"

test/CheckoutUtilityTest.py

@@ -2,6 +2,8 @@
 import unittest
 from BaseTest import BaseTest
 
+from Adyen import settings
+
 
 class TestCheckoutUtility(unittest.TestCase):
     ady = Adyen.Adyen()
@@ -20,6 +22,7 @@ def test_origin_keys_success_mocked(self):
                 "https://www.your-domain3.com"
             }
         }
+
         self.ady.client = self.test.create_client_from_file(200, request,
                                                             "test/mocks/"
                                                             "checkoututility/"