Remove deprecated API interface

src/commercetools/__init__.py

@@ -1,5 +1,4 @@
-from .client import Client
 from .exceptions import CommercetoolsError
 from .version import __version__
 
-__all__ = ["Client", "CommercetoolsError"]
+__all__ = ["CommercetoolsError"]

src/commercetools/base_client.py

@@ -11,7 +11,6 @@
 from commercetools.constants import HEADER_CORRELATION_ID
 from commercetools.exceptions import CommercetoolsError
 from commercetools.helpers import _concurrent_retry
-from commercetools.services import ServicesMixin
 from commercetools.utils import BaseTokenSaver, DefaultTokenSaver, fix_token_url
 from commercetools.version import __version__
 
@@ -53,7 +52,7 @@ def __init__(
     ) -> None:
         # Use environment variables as fallback
         config = {
-            "project_key": project_key,
+            "project_key": project_key or "example-project",
             "client_id": client_id,
             "client_secret": client_secret,
             "url": url,
@@ -231,9 +230,3 @@ def _get_user_agent(self):
             sys.platform,
             arch,
         )
-
-
-class Client(BaseClient, ServicesMixin):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._base_url = f"{self._config['url']}/{self._config['project_key']}/"

src/commercetools/checkout/client/__init__.py

@@ -4,11 +4,10 @@
 # contribute to this project then please do not edit this file directly
 # but send a pull request to the Lab Digital fork of rmf-codegen at
 # https://github.com/labd/rmf-codegen
-
-from commercetools.client import BaseClient
+from commercetools.base_client import BaseClient
 
 
 class Client(BaseClient):
     def __init__(self, *args, **kwargs):
         kwargs.setdefault("url", "https://checkout.{region}.commercetools.com")
-        super().__init__(self, **kwargs)
+        super().__init__(**kwargs)

src/commercetools/contrib/pytest.py

@@ -5,7 +5,6 @@
 import pytest
 import requests
 
-from commercetools import Client
 from commercetools.platform.client import Client as PlatformClient
 from commercetools.testing import backend_mocker
 from commercetools.testing.server import Server
@@ -25,7 +24,9 @@ def commercetools_api():
 
 
 @pytest.fixture
-def ct_platform_client(commercetools_api) -> typing.Generator[Client, None, None]:
+def ct_platform_client(
+    commercetools_api,
+) -> typing.Generator[PlatformClient, None, None]:
     yield PlatformClient(
         client_id="client-id",
         client_secret="client-secret",
@@ -35,18 +36,6 @@ def ct_platform_client(commercetools_api) -> typing.Generator[Client, None, None
     )
 
 
-@pytest.fixture
-def commercetools_client(commercetools_api) -> typing.Generator[Client, None, None]:
-    yield Client(
-        project_key="unittest",
-        client_id="client-id",
-        client_secret="client-secret",
-        scope=[],
-        url="https://api.europe-west1.gcp.commercetools.com",
-        token_url="https://auth.europe-west1.gcp.commercetools.com/oauth/token",
-    )
-
-
 @pytest.fixture()
 def commercetools_http_server(commercetools_api):
     is_running = threading.Event()

src/commercetools/importapi/client/__init__.py

@@ -4,7 +4,7 @@
 # contribute to this project then please do not edit this file directly
 # but send a pull request to the Lab Digital fork of rmf-codegen at
 # https://github.com/labd/rmf-codegen
-from commercetools.client import BaseClient
+from commercetools.base_client import BaseClient
 
 from .by_project_key_request_builder import ByProjectKeyRequestBuilder
 
@@ -13,7 +13,7 @@ class Client(BaseClient):
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault("url", "https://import.europe-west1.gcp.commercetools.com")
-        super().__init__(self, **kwargs)
+        super().__init__(**kwargs)
 
     def with_project_key_value(self, project_key: str) -> ByProjectKeyRequestBuilder:
         return ByProjectKeyRequestBuilder(

src/commercetools/platform/client/__init__.py

@@ -4,7 +4,7 @@
 # contribute to this project then please do not edit this file directly
 # but send a pull request to the Lab Digital fork of rmf-codegen at
 # https://github.com/labd/rmf-codegen
-from commercetools.client import BaseClient
+from commercetools.base_client import BaseClient
 
 from .by_project_key_request_builder import ByProjectKeyRequestBuilder
 
@@ -13,7 +13,7 @@ class Client(BaseClient):
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault("url", "https://api.{region}.commercetools.com")
-        super().__init__(self, **kwargs)
+        super().__init__(**kwargs)
 
     def with_project_key(self, project_key: str) -> ByProjectKeyRequestBuilder:
         """The Project endpoint is used to retrieve certain information from a project."""

src/commercetools/platform/client/active_cart/by_project_key_in_store_key_by_store_key_me_active_cart_request_builder.py

@@ -57,7 +57,7 @@ def get(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)
 
     def head(

src/commercetools/platform/client/active_cart/by_project_key_me_active_cart_request_builder.py

@@ -53,7 +53,7 @@ def get(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)
 
     def head(

src/commercetools/platform/client/api_clients/by_project_key_api_clients_by_id_request_builder.py

@@ -49,7 +49,7 @@ def get(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)
 
     def head(
@@ -94,5 +94,5 @@ def delete(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)

src/commercetools/platform/client/api_clients/by_project_key_api_clients_request_builder.py

@@ -74,7 +74,7 @@ def get(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)
 
     def head(
@@ -123,5 +123,5 @@ def post(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)

src/commercetools/platform/client/apply/by_project_key_orders_edits_by_id_apply_request_builder.py

@@ -52,5 +52,5 @@ def post(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)

src/commercetools/platform/client/business_units/by_project_key_business_units_by_id_request_builder.py

@@ -50,7 +50,7 @@ def get(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)
 
     def head(
@@ -98,7 +98,7 @@ def post(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)
 
     def delete(
@@ -122,5 +122,5 @@ def delete(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)

src/commercetools/platform/client/business_units/by_project_key_business_units_key_by_key_request_builder.py

@@ -50,7 +50,7 @@ def get(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)
 
     def head(
@@ -98,7 +98,7 @@ def post(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)
 
     def delete(
@@ -122,5 +122,5 @@ def delete(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)

src/commercetools/platform/client/business_units/by_project_key_business_units_request_builder.py

@@ -88,7 +88,7 @@ def get(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)
 
     def head(
@@ -137,5 +137,5 @@ def post(
             obj = ErrorResponse.deserialize(response.json())
             raise self._client._create_exception(obj, response)
         elif response.status_code == 404:
-            return None
+            raise self._client._create_exception(None, response)
         warnings.warn("Unhandled status code %d" % response.status_code)