Release 2.20180712.3 (#72)

* Release 2.20180712.3

Author: ssung88

CHANGES.md

@@ -1,4 +1,8 @@
 # Change Log
+## Version 2.20180712.3 (2018-08-24)
+
+Remove singleton constraint for configuration class. This is a minor breaking change to ```ApiClient```
+and ```RESTClientObject``` initialization.
 
 ## Version 2.20180712.2 (2018-08-21)
 

setup.py

@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 NAME = "squareconnect"
-VERSION = "2.20180712.2"
+VERSION = "2.20180712.3"
 
 
 

squareconnect/__init__.py

@@ -219,5 +219,3 @@
 from .api_client import ApiClient
 
 from .configuration import Configuration
-
-configuration = Configuration()

squareconnect/api_client.py

@@ -65,22 +65,17 @@ class ApiClient(object):
     :param header_name: a header to pass when making calls to the API.
     :param header_value: a header value to pass when making calls to the API.
     """
-    def __init__(self, host=None, header_name=None, header_value=None, cookie=None):
-
-        """
-        Constructor of the class.
-        """
-        self.rest_client = RESTClientObject()
+    def __init__(self, configuration=None, header_name=None, header_value=None, cookie=None):
+        if configuration is None:
+            configuration = Configuration()
+        self.configuration = configuration
+        self.rest_client = RESTClientObject(configuration)
         self.default_headers = {}
         if header_name is not None:
             self.default_headers[header_name] = header_value
-        if host is None:
-            self.host = Configuration().host
-        else:
-            self.host = host
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'Square-Connect-Python/2.20180712.2'
+        self.user_agent = 'Square-Connect-Python/2.20180712.3'
 
     @property
     def user_agent(self):
@@ -139,7 +134,7 @@ def __call_api(self, resource_path, method,
             body = self.sanitize_for_serialization(body)
 
         # request url
-        url = self.host + resource_path
+        url = self.configuration.host + resource_path
 
         # perform request and return response
         response_data = self.request(method, url,
@@ -448,13 +443,12 @@ def update_params_for_auth(self, headers, querys, auth_settings):
         :param querys: Query parameters dict to be updated.
         :param auth_settings: Authentication setting identifiers list.
         """
-        config = Configuration()
 
         if not auth_settings:
             return
 
         for auth in auth_settings:
-            auth_setting = config.auth_settings().get(auth)
+            auth_setting = self.configuration.auth_settings().get(auth)
             if auth_setting:
                 if not auth_setting['value']:
                     continue
@@ -475,9 +469,8 @@ def __deserialize_file(self, response):
         :param response:  RESTResponse.
         :return: file path.
         """
-        config = Configuration()
 
-        fd, path = tempfile.mkstemp(dir=config.temp_folder_path)
+        fd, path = tempfile.mkstemp(dir=self.configuration.temp_folder_path)
         os.close(fd)
         os.remove(path)
 

squareconnect/apis/apple_pay_api.py

@@ -26,7 +26,6 @@
 # python 2 and python 3 compatibility library
 from six import iteritems
 
-from ..configuration import Configuration
 from ..api_client import ApiClient
 
 
@@ -38,13 +37,9 @@ class ApplePayApi(object):
     """
 
     def __init__(self, api_client=None):
-        config = Configuration()
-        if api_client:
-            self.api_client = api_client
-        else:
-            if not config.api_client:
-                config.api_client = ApiClient()
-            self.api_client = config.api_client
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
 
     def register_domain(self, body, **kwargs):
         """

squareconnect/apis/catalog_api.py

@@ -26,7 +26,6 @@
 # python 2 and python 3 compatibility library
 from six import iteritems
 
-from ..configuration import Configuration
 from ..api_client import ApiClient
 
 
@@ -38,13 +37,9 @@ class CatalogApi(object):
     """
 
     def __init__(self, api_client=None):
-        config = Configuration()
-        if api_client:
-            self.api_client = api_client
-        else:
-            if not config.api_client:
-                config.api_client = ApiClient()
-            self.api_client = config.api_client
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
 
     def batch_delete_catalog_objects(self, body, **kwargs):
         """

squareconnect/apis/checkout_api.py

@@ -26,7 +26,6 @@
 # python 2 and python 3 compatibility library
 from six import iteritems
 
-from ..configuration import Configuration
 from ..api_client import ApiClient
 
 
@@ -38,13 +37,9 @@ class CheckoutApi(object):
     """
 
     def __init__(self, api_client=None):
-        config = Configuration()
-        if api_client:
-            self.api_client = api_client
-        else:
-            if not config.api_client:
-                config.api_client = ApiClient()
-            self.api_client = config.api_client
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
 
     def create_checkout(self, location_id, body, **kwargs):
         """

squareconnect/apis/customers_api.py

@@ -26,7 +26,6 @@
 # python 2 and python 3 compatibility library
 from six import iteritems
 
-from ..configuration import Configuration
 from ..api_client import ApiClient
 
 
@@ -38,13 +37,9 @@ class CustomersApi(object):
     """
 
     def __init__(self, api_client=None):
-        config = Configuration()
-        if api_client:
-            self.api_client = api_client
-        else:
-            if not config.api_client:
-                config.api_client = ApiClient()
-            self.api_client = config.api_client
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
 
     def create_customer(self, body, **kwargs):
         """

squareconnect/apis/locations_api.py

@@ -26,7 +26,6 @@
 # python 2 and python 3 compatibility library
 from six import iteritems
 
-from ..configuration import Configuration
 from ..api_client import ApiClient
 
 
@@ -38,13 +37,9 @@ class LocationsApi(object):
     """
 
     def __init__(self, api_client=None):
-        config = Configuration()
-        if api_client:
-            self.api_client = api_client
-        else:
-            if not config.api_client:
-                config.api_client = ApiClient()
-            self.api_client = config.api_client
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
 
     def list_locations(self, **kwargs):
         """

squareconnect/apis/mobile_authorization_api.py

@@ -26,7 +26,6 @@
 # python 2 and python 3 compatibility library
 from six import iteritems
 
-from ..configuration import Configuration
 from ..api_client import ApiClient
 
 
@@ -38,13 +37,9 @@ class MobileAuthorizationApi(object):
     """
 
     def __init__(self, api_client=None):
-        config = Configuration()
-        if api_client:
-            self.api_client = api_client
-        else:
-            if not config.api_client:
-                config.api_client = ApiClient()
-            self.api_client = config.api_client
+        if api_client is None:
+            api_client = ApiClient()
+        self.api_client = api_client
 
     def create_mobile_authorization_code(self, body, **kwargs):
         """