Merge branch 'develop'

addonpayments/api/card_storage/requests.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
 from attr import ib as Field
 

addonpayments/api/client.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import requests
 import attr
 from decouple import config
@@ -58,7 +60,7 @@ def send(self, request, response_validation=True):
             result = requests.post(self.endpoint, data=xml.encode(self.encoding_charset), headers=self.headers)
         except requests.exceptions.RequestException as e:
             error_msg = "POST requests error"
-            logger.error("{}: {}".format(error_msg))
+            logger.error(error_msg)
             raise SdkError(error_msg, e)
 
         normalized_dict = XmlUtils.from_xml_api_response(result.text)

addonpayments/api/common/requests.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
 from attr import ib as Field
 

addonpayments/api/common/responses.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 from addonpayments.responses import SdkResponse
 
 

addonpayments/api/dcc/requests.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
 from attr import ib as Field
 

addonpayments/api/elements.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
 from attr import ib as Field
 

addonpayments/api/mixins.py

@@ -1,6 +1,9 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
+import six
 from attr import ib as Field
 
 from addonpayments.mixins import DictMixin
@@ -82,7 +85,7 @@ def normalize_xml(self):
         :return: dict
         """
         result = {}
-        for key, value in self.to_dict().items():
+        for key, value in six.iteritems(self.to_dict()):
             # This field (key) is an object
             if key in self.object_fields:
                 result.update(value.normalize_xml())

addonpayments/api/payment/requests.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
 from attr import ib as Field
 

addonpayments/api/tests/conftest.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import pytest
 from decouple import config
 

addonpayments/api/tests/tests/test_card_storage.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import pytest
 
 from addonpayments.api.tests.conftest import BaseTest

addonpayments/api/tests/tests/test_dcc.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import pytest
 
 from addonpayments.api.tests.conftest import BaseTest

addonpayments/api/tests/tests/test_payment.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 from addonpayments.api.tests.conftest import BaseTest
 from addonpayments.api.client import ApiClient
 from addonpayments.api.payment.requests import AuthRequest

addonpayments/api/tests/tests/test_three_ds.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import pytest
 
 from addonpayments.api.tests.conftest import BaseTest

addonpayments/api/tests/tests/test_transaction_management.py

@@ -1,4 +1,7 @@
 # -*- encoding: utf-8 -*-
+
+from __future__ import absolute_import, unicode_literals
+
 import pytest
 
 from addonpayments.api.tests.conftest import BaseTest

addonpayments/api/three_ds/requests.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
 from attr import ib as Field
 

addonpayments/api/three_ds/validators.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 from addonpayments.utils import ValidateUtils as Validate
 
 

addonpayments/api/transaction_management/requests.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
 from attr import ib as Field
 

addonpayments/api/transaction_management/validators.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 from addonpayments.utils import ValidateUtils as Validate
 
 

addonpayments/api/utils.py

@@ -1,5 +1,8 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
+import six
 import xmltodict
 import json
 
@@ -40,7 +43,7 @@ def from_xml_api_response(xml):
         try:
             resp = json.loads(json.dumps(xmltodict.parse(xml)))
             resp['response']
-            response = {key.replace('@', ''): value for key, value in resp['response'].items()}
+            response = {key.replace('@', ''): value for key, value in six.iteritems(resp['response'])}
         except Exception as e:
             error_msg = "Error parsing response XML"
             logger.error("{}: {}".format(error_msg, e))

addonpayments/api/validators.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 from addonpayments.utils import ValidateUtils as Validate
 
 

addonpayments/exceptions.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 
 class SdkError(Exception):
     """

addonpayments/hpp/card_storage/requests.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
 from attr import ib as Field
 

addonpayments/hpp/card_storage/validators.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 from addonpayments.utils import ValidateUtils as Validate
 
 

addonpayments/hpp/common/requests.py

@@ -1,6 +1,9 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
+import six
 from attr import ib as Field
 
 from addonpayments.mixins import DictMixin, HashMixin
@@ -65,20 +68,20 @@ def to_dict(self):
         :return: dict
         """
         result = {}
-        for key, value in self.__dict__.items():
+        for key, value in six.iteritems(self.__dict__):
             # Add supplementary data into dict
             if key == 'supplementary_data':
                 try:
-                    for key_supp, value_supp in self.supplementary_data.items():
-                        if key_supp not in self.__dict__.keys():
+                    for key_supp, value_supp in six.iteritems(self.supplementary_data):
+                        if key_supp not in six.iterkeys(self.__dict__):
                             result[key_supp] = value_supp
                 except AttributeError:
                     result[key.upper()] = value
-
-            # Parse boolean fields to str '1' (True) or '0' (False)
-            result_value = self.set_flags(key, value)
-            if result_value:
-                result[key.upper()] = result_value
+            else:
+                # Parse boolean fields to str '1' (True) or '0' (False)
+                result_value = self.set_flags(key, value)
+                if result_value:
+                    result[key.upper()] = result_value
         return result
 
     def hash(self, secret):

addonpayments/hpp/common/responses.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 from addonpayments.responses import SdkResponse
 
 

addonpayments/hpp/hpp.py

@@ -1,6 +1,9 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
+import six
 
 from addonpayments.exceptions import SdkError
 from addonpayments.logger import Logger
@@ -143,7 +146,7 @@ def response_from_dict(self, response_dict):
         :return:
         """
         logger.info("Converting dict to HppResponse.")
-        normalized_dict = {key.lower(): value for key, value in response_dict.items()}
+        normalized_dict = {key.lower(): value for key, value in six.iteritems(response_dict)}
         hpp_response = HppResponse(**normalized_dict)
 
         return ValidationUtils.validate_response(hpp_response, self.secret)

addonpayments/hpp/payment/requests.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import attr
 
 from addonpayments.hpp.common.requests import HppRequest

addonpayments/hpp/tests/conftest.py

@@ -1,5 +1,8 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
+import codecs
 import pytest
 
 from addonpayments.hpp.card_storage.requests import CardStorageRequest
@@ -30,35 +33,35 @@ def valid_hpp_request_storage_enabled():
 
 @pytest.fixture()
 def json_hpp_payment_request_valid():
-    with open(sample_path(HPP_PAYMENT_REQUEST_VALID_JSON_PATH)) as data_file:
-        yield JsonUtils.from_json_hpp_request(data_file, CHARSET, False)
+    with codecs.open(sample_path(HPP_PAYMENT_REQUEST_VALID_JSON_PATH), 'r', encoding='utf-8') as data_file:
+        yield JsonUtils.from_json_hpp_request(data_file.read(), CHARSET, False)
 
 
 @pytest.fixture()
 def json_hpp_payment_request_supplementary_data():
-    with open(sample_path(HPP_PAYMENT_REQUEST_SUPPLEMENTARY_JSON_PATH)) as data_file:
-        yield JsonUtils.from_json_hpp_request(data_file, CHARSET, False)
+    with codecs.open(sample_path(HPP_PAYMENT_REQUEST_SUPPLEMENTARY_JSON_PATH), 'r', encoding='utf-8') as data_file:
+        yield JsonUtils.from_json_hpp_request(data_file.read(), CHARSET, False)
 
 
 @pytest.fixture()
 def json_hpp_payment_request_encoded():
-    with open(sample_path(HPP_PAYMENT_REQUEST_ENCODED_JSON_PATH)) as data_file:
-        yield JsonUtils.from_json_hpp_request(data_file, CHARSET, True)
+    with codecs.open(sample_path(HPP_PAYMENT_REQUEST_ENCODED_JSON_PATH), 'r', encoding='utf-8') as data_file:
+        yield JsonUtils.from_json_hpp_request(data_file.read(), CHARSET, True)
 
 
 @pytest.fixture()
 def json_hpp_card_storage_request_valid():
-    with open(sample_path(HPP_CARD_STORAGE_REQUEST_VALID_JSON_PATH)) as data_file:
-        yield JsonUtils.from_json_hpp_request(data_file, CHARSET, False)
+    with codecs.open(sample_path(HPP_CARD_STORAGE_REQUEST_VALID_JSON_PATH), 'r', encoding='utf-8') as data_file:
+        yield JsonUtils.from_json_hpp_request(data_file.read(), CHARSET, False)
 
 
 @pytest.fixture()
-def json_hpp_card_storage_request_supplementary_data():
-    with open(sample_path(HPP_CARD_STORAGE_REQUEST_SUPPLEMENTARY_JSON_PATH)) as data_file:
-        yield JsonUtils.from_json_hpp_request(data_file, CHARSET, False)
+def json_hpp_card_storage_request_supp_data():
+    with codecs.open(sample_path(HPP_CARD_STORAGE_REQUEST_SUPPLEMENTARY_JSON_PATH), 'r', encoding='utf-8') as data_file:
+        yield JsonUtils.from_json_hpp_request(data_file.read(), CHARSET, False)
 
 
 @pytest.fixture()
 def json_hpp_card_storage_request_encoded():
-    with open(sample_path(HPP_CARD_STORAGE_REQUEST_ENCODED_JSON_PATH)) as data_file:
-        yield JsonUtils.from_json_hpp_request(data_file, CHARSET, True)
+    with codecs.open(sample_path(HPP_CARD_STORAGE_REQUEST_ENCODED_JSON_PATH), 'r', encoding='utf-8') as data_file:
+        yield JsonUtils.from_json_hpp_request(data_file.read(), CHARSET, True)

addonpayments/hpp/tests/samples/hpp_card_storage_request.json

@@ -9,7 +9,6 @@
   "AUTO_SETTLE_FLAG": "1",
   "COMMENT1": "a-z A-Z 0-9 ' \", + “” ._ - & \\ / @ ! ? % ( )* : £ $ & € # [ ] | = ;ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷ø¤ùúûüýþÿŒŽšœžŸ¥",
   "COMMENT2": "Comment Two",
-  "RETURN_TSS": "0",
   "SHIPPING_CODE": "56|987",
   "SHIPPING_CO": "IRELAND",
   "BILLING_CODE": "123|56",

addonpayments/hpp/tests/samples/hpp_card_storage_request_encoded.json

@@ -9,7 +9,6 @@
   "AUTO_SETTLE_FLAG": "MQ==",
   "COMMENT1": "Q29tbWVudCBUd28=",
   "COMMENT2": "Q29tbWVudCBUd28=",
-  "RETURN_TSS": "MA==",
   "SHIPPING_CODE": "NTZ8OTg3",
   "SHIPPING_CO": "SVJFTEFORA==",
   "BILLING_CODE": "MTIzfDU2",

addonpayments/hpp/tests/samples/hpp_payment_request.json

@@ -9,7 +9,6 @@
   "AUTO_SETTLE_FLAG": "1",
   "COMMENT1": "a-z A-Z 0-9 ' \", + “” ._ - & \\ / @ ! ? % ( )* : £ $ & € # [ ] | = ;ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷ø¤ùúûüýþÿŒŽšœžŸ¥",
   "COMMENT2": "Comment Two",
-  "RETURN_TSS": "0",
   "SHIPPING_CODE": "56|987",
   "SHIPPING_CO": "IRELAND",
   "BILLING_CODE": "123|56",

addonpayments/hpp/tests/tests/test_generation_utils.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 import re
 
 from addonpayments.utils import GenerationUtils

addonpayments/hpp/tests/tests/test_hpp_request.py

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+from __future__ import absolute_import, unicode_literals
+
 
 class TestHppRequest:
     secret = "mysecret"