updated call to Schema.dumps() in marshmallow v3

Matiasnickolas · Matiasnickolas · commit c909728a304c · 2022-07-11T11:34:49.000-04:00
diff --git a/Pipfile b/Pipfile
@@ -13,7 +13,7 @@ pylint = "*"
 requests-mock = "<=1.5.2"
 
 [packages]
-marshmallow = '<3'
+marshmallow = '>3, <=3.17'
 requests = '>=2.22.0'
 mock = "*"
 
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
 
 # What packages are required for this module to be executed?
 REQUIRED = [
-  "marshmallow<3",
+  "marshmallow>3, <=3.17",
   "requests>=2.20.0"
 ]
 
diff --git a/transbank/patpass_by_webpay/transaction.py b/transbank/patpass_by_webpay/transaction.py
@@ -35,7 +35,7 @@ def create(self, buy_order: str, session_id: str, amount: float, return_url: str
             request = TransactionCreateRequest(buy_order, session_id, amount, return_url, service_id, card_holder_id,
                                            card_holder_name, card_holder_last_name1, card_holder_last_name2,
                                            card_holder_mail, cellphone_number, expiration_date, commerce_mail, uf_flag)
-            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCreateError(e.message, e.code)
 
diff --git a/transbank/patpass_comercio/inscription.py b/transbank/patpass_comercio/inscription.py
@@ -45,15 +45,15 @@ def start(self, url: str,
                                           service_id, final_url, self.options.commerce_code, m_amount,
                                           phone, cell_phone, patpass_name, person_email,
                                           commerce_email, address, city)
-            return RequestService.post(endpoint, InscriptionStartRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, InscriptionStartRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise InscriptionStartError(e.message, e.code)
     
     def status(self, token: str):
         try:
             endpoint = Inscription.STATUS_ENDPOINT
             request = InscriptionStatusRequest(token)
-            return RequestService.post(endpoint, InscriptionStatusRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, InscriptionStatusRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise InscriptionStatusError(e.message, e.code)
 
diff --git a/transbank/webpay/oneclick/mall_inscription.py b/transbank/webpay/oneclick/mall_inscription.py
@@ -31,7 +31,7 @@ def start(self, username: str, email: str, response_url: str):
         try:
             endpoint = MallInscription.START_ENDPOINT
             request = MallInscriptionStartRequest(username, email, response_url)
-            return RequestService.post(endpoint, MallInscriptionStartRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, MallInscriptionStartRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise InscriptionStartError(e.message, e.code)
 
@@ -49,7 +49,7 @@ def delete(self, tbk_user: str, username: str):
         try:
             endpoint = MallInscription.DELETE_ENDPOINT
             request = MallInscriptionDeleteRequest(username, tbk_user)
-            RequestService.delete(endpoint, MallInscriptionDeleteRequestSchema().dumps(request).data, self.options)
+            RequestService.delete(endpoint, MallInscriptionDeleteRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise InscriptionDeleteError(e.message, e.code)
 
diff --git a/transbank/webpay/oneclick/mall_transaction.py b/transbank/webpay/oneclick/mall_transaction.py
@@ -37,7 +37,7 @@ def authorize(self, username: str, tbk_user: str, parent_buy_order: str, details
         try:
             endpoint = MallTransaction.AUTHORIZE_ENDPOINT
             request = MallTransactionAuthorizeRequest(username, tbk_user, parent_buy_order, details.details)
-            return RequestService.post(endpoint, MallTransactionAuthorizeRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, MallTransactionAuthorizeRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionAuthorizeError(e.message, e.code)
 
@@ -48,7 +48,7 @@ def capture(self, child_commerce_code: str, child_buy_order: str, authorization_
         try:
             endpoint = MallTransaction.CAPTURE_ENDPOINT
             request = MallTransactionCaptureRequest(child_commerce_code, child_buy_order, authorization_code, capture_amount)
-            return RequestService.put(endpoint, MallTransactionCaptureRequestSchema().dumps(request).data, self.options)
+            return RequestService.put(endpoint, MallTransactionCaptureRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCaptureError(e.message, e.code)
 
@@ -67,7 +67,7 @@ def refund(self, buy_order: str, child_commerce_code: str, child_buy_order: str,
         try:
             endpoint = MallTransaction.REFUND_ENDPOINT.format(buy_order)
             request = MallTransactionRefundRequest(child_commerce_code, child_buy_order, amount)
-            return RequestService.post(endpoint, MallTransactionRefundRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, MallTransactionRefundRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionRefundError(e.message, e.code)
 
diff --git a/transbank/webpay/transaccion_completa/mall_transaction.py b/transbank/webpay/transaccion_completa/mall_transaction.py
@@ -43,7 +43,7 @@ def create(self, buy_order: str, session_id: str, card_number: str, card_expirat
         try:
             endpoint = MallTransaction.CREATE_ENDPOINT
             request = TransactionCreateRequest(buy_order, session_id, card_number, card_expiration_date, details, cvv)
-            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCreateError(e.message, e.code)      
 
@@ -52,7 +52,7 @@ def commit(self, token: str, details: list):
         try:
             endpoint = MallTransaction.COMMIT_ENDPOINT.format(token)
             request = TransactionCommitRequest(details)
-            return RequestService.put(endpoint, TransactionCommitRequestSchema().dumps(request).data, self.options)
+            return RequestService.put(endpoint, TransactionCommitRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCommitError(e.message, e.code)
 
@@ -71,7 +71,7 @@ def refund(self, token: str, child_buy_order: str, child_commerce_code: str, amo
         try:
             endpoint = MallTransaction.REFUND_ENDPOINT.format(token)
             request = TransactionRefundRequest(buy_order=child_buy_order, commerce_code=child_commerce_code, amount=amount)
-            return RequestService.post(endpoint, TransactionRefundRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionRefundRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionRefundError(e.message, e.code)
 
@@ -84,7 +84,7 @@ def capture(self, token: str, child_commerce_code: str, child_buy_order: str, au
             endpoint = MallTransaction.CAPTURE_ENDPOINT.format(token)
             request = TransactionCaptureRequest(commerce_code=child_commerce_code, buy_order=child_buy_order,
                                             authorization_code=authorization_code, capture_amount=capture_amount)
-            return RequestService.put(endpoint, TransactionCaptureRequestSchema().dumps(request).data, self.options)
+            return RequestService.put(endpoint, TransactionCaptureRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCaptureError(e.message, e.code)
 
@@ -113,7 +113,7 @@ def single_installment(self, token: str, installments_number: float, buy_order:
             endpoint = MallTransaction.INSTALLMENTS_ENDPOINT.format(token)
             request = TransactionInstallmentsRequest(installments_number=installments_number, buy_order=buy_order,
                                                  commerce_code=commerce_code)
-            return RequestService.post(endpoint, TransactionInstallmentsRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionInstallmentsRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionInstallmentsError(e.message, e.code)   
 
diff --git a/transbank/webpay/transaccion_completa/transaction.py b/transbank/webpay/transaccion_completa/transaction.py
@@ -40,7 +40,7 @@ def create(self, buy_order: str, session_id: str, amount: float, cvv: str, card_
         try:
             endpoint = Transaction.CREATE_ENDPOINT
             request = TransactionCreateRequest(buy_order, session_id, amount, card_number, cvv, card_expiration_date)
-            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCreateError(e.message, e.code)
 
@@ -49,7 +49,7 @@ def commit(self, token: str, id_query_installments: str, deferred_period_index:
         try:
             endpoint = Transaction.COMMIT_ENDPOINT.format(token)
             request = TransactionCommitRequest(id_query_installments, deferred_period_index, grace_period)
-            return RequestService.put(endpoint, TransactionCommitRequestSchema().dumps(request).data, self.options)
+            return RequestService.put(endpoint, TransactionCommitRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCommitError(e.message, e.code)
 
@@ -77,7 +77,7 @@ def capture(self, token: str, buy_order: str, authorization_code: str, capture_a
         try:
             endpoint = Transaction.CAPTURE_ENDPOINT.format(token)
             request = TransactionCaptureRequest(buy_order, authorization_code, capture_amount)
-            return RequestService.put(endpoint, TransactionCaptureRequestSchema().dumps(request).data, self.options)
+            return RequestService.put(endpoint, TransactionCaptureRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCaptureError(e.message, e.code)
 
@@ -86,7 +86,7 @@ def installments(self, token: str, installments_number: int):
         try:
             endpoint = Transaction.INSTALLMENTS_ENDPOINT.format(token)
             request = TransactionInstallmentsRequest(installments_number)
-            return RequestService.post(endpoint, TransactionInstallmentsRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionInstallmentsRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionInstallmentsError(e.message, e.code)
 
diff --git a/transbank/webpay/webpay_plus/mall_transaction.py b/transbank/webpay/webpay_plus/mall_transaction.py
@@ -40,7 +40,7 @@ def create(self, buy_order: str, session_id: str, return_url: str, details: Mall
         try:
             endpoint = MallTransaction.CREATE_ENDPOINT
             request = MallTransactionCreateRequest(buy_order, session_id, return_url, details.details)
-            return RequestService.post(endpoint, MallTransactionCreateRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, MallTransactionCreateRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCreateError(e.message, e.code)
 
@@ -67,7 +67,7 @@ def refund(self, token: str, child_buy_order: str, child_commerce_code:str, amou
         try:
             endpoint = MallTransaction.REFUND_ENDPOINT.format(token)
             request = MallTransactionRefundRequest(commerce_code=child_commerce_code, buy_order=child_buy_order,  amount=amount)
-            return RequestService.post(endpoint, MallTransactionRefundRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, MallTransactionRefundRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionRefundError(e.message, e.code)
 
@@ -79,7 +79,7 @@ def capture(self, child_commerce_code: str, token: str, buy_order: str, authoriz
         try:
             endpoint = MallTransaction.CAPTURE_ENDPOINT.format(token)
             request = MallTransactionCaptureRequest(child_commerce_code, buy_order, authorization_code, capture_amount)
-            return RequestService.put(endpoint, MallTransactionCaptureRequestSchema().dumps(request).data, self.options)
+            return RequestService.put(endpoint, MallTransactionCaptureRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCaptureError(e.message, e.code)
 
diff --git a/transbank/webpay/webpay_plus/transaction.py b/transbank/webpay/webpay_plus/transaction.py
@@ -34,7 +34,7 @@ def create(self, buy_order: str, session_id: str, amount: float, return_url: str
         try:
             endpoint = Transaction.CREATE_ENDPOINT
             request = TransactionCreateRequest(buy_order, session_id, amount, return_url)
-            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCreateError(e.message, e.code)
 
@@ -59,7 +59,7 @@ def refund(self, token: str, amount: float):
         try:
             endpoint = Transaction.REFUND_ENDPOINT.format(token)
             request = TransactionRefundRequest(amount)
-            return RequestService.post(endpoint, TransactionRefundRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionRefundRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionRefundError(e.message, e.code)
 
@@ -70,7 +70,7 @@ def capture(self, token: str, buy_order: str, authorization_code: str, capture_a
         try:
             endpoint = Transaction.CAPTURE_ENDPOINT.format(token)
             request = TransactionCaptureRequest(buy_order, authorization_code, capture_amount)
-            return RequestService.put(endpoint, TransactionCaptureRequestSchema().dumps(request).data, self.options)
+            return RequestService.put(endpoint, TransactionCaptureRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCaptureError(e.message, e.code)
 
diff --git a/transbank/webpay/webpay_plus_modal/transaction.py b/transbank/webpay/webpay_plus_modal/transaction.py
@@ -32,7 +32,7 @@ def create(self, buy_order: str, session_id: str, amount: float):
         try:
             endpoint = Transaction.CREATE_ENDPOINT
             request = TransactionCreateRequest(buy_order, session_id, amount)
-            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionCreateRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionCreateError(e.message, e.code)
 
@@ -57,7 +57,7 @@ def refund(self, token: str, amount: float):
         try:
             endpoint = Transaction.REFUND_ENDPOINT.format(token)
             request = TransactionRefundRequest(amount)
-            return RequestService.post(endpoint, TransactionRefundRequestSchema().dumps(request).data, self.options)
+            return RequestService.post(endpoint, TransactionRefundRequestSchema().dumps(request), self.options)
         except TransbankError as e:
             raise TransactionRefundError(e.message, e.code)
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`# What packages are required for this module to be executed?`
`25`	`25`	`REQUIRED = [`
`26`		`- "marshmallow<3",`
	`26`	`+ "marshmallow>3, <=3.17",`
`27`	`27`	`"requests>=2.20.0"`
`28`	`28`	`]`
`29`	`29`