Skip to content

Commit 14905a6

Browse files
delias-silvadelias-silva
committed
Fixing some issues
1 parent 2884012 commit 14905a6

13 files changed

Lines changed: 70 additions & 68 deletions

‎mercadopago/card.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
from .mercadopagorestclient import MercadoPagoRestClient
22

33
class Card(MercadoPagoRestClient):
4-
def __init__(self, client_id, client_secret, access_token):
5-
super(Card, self).__init__(client_id, client_secret, access_token)
4+
def __init__(self, client_id, client_secret, access_token, version):
5+
super(Card, self).__init__(client_id, client_secret, access_token, version)
66

77
def create(self, card):
88
access_token = self.get_access_token()
9-
result = self.__rest_client.post("/v1/customers/" + id + "/cards?access_token=" + access_token, card)
9+
result = self.get_rest_client().post("/v1/customers/" + id + "/cards?access_token=" + access_token, card)
1010
return result
1111

1212
def update(self, id, card):
1313
access_token = self.get_access_token()
14-
result = self.__rest_client.put("/v1/customers/" + id + "/cards?access_token=" + access_token, card)
14+
result = self.get_rest_client().put("/v1/customers/" + id + "/cards?access_token=" + access_token, card)
1515
return result
1616

1717
def delete(self, id):
1818
access_token = self.get_access_token()
19-
result = self.__rest_client.delete("/v1/customers/" + id + "/cards?access_token=" + access_token)
19+
result = self.get_rest_client().delete("/v1/customers/" + id + "/cards?access_token=" + access_token)
2020
return result
2121

2222
def get(self, id):
2323
access_token = self.get_access_token()
24-
result = self.__rest_client.get("/v1/customers/" + id + "/cards?access_token=" + access_token)
24+
result = self.get_rest_client().get("/v1/customers/" + id + "/cards?access_token=" + access_token)
2525
return result

‎mercadopago/cardtoken.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
from .mercadopagorestclient import MercadoPagoRestClient
22

33
class CardToken(MercadoPagoRestClient):
4-
def __init__(self, client_id, client_secret, access_token):
5-
super(CardToken, self).__init__(client_id, client_secret, access_token)
4+
def __init__(self, client_id, client_secret, access_token, version):
5+
super(CardToken, self).__init__(client_id, client_secret, access_token, version)
66

77
def create(self, cardtoken):
88
access_token = self.get_access_token()
9-
result = self.__rest_client.post("/v1/card_tokens?access_token=" + access_token, cardtoken)
9+
result = self.get_rest_client().post("/v1/card_tokens?access_token=" + access_token, cardtoken)
1010
return result
1111

1212
def get(self, id):
1313
access_token = self.get_access_token()
14-
result = self.__rest_client.get("/v1/card_tokens/" + id + "?access_token=" + access_token)
14+
result = self.get_rest_client().get("/v1/card_tokens/" + id + "?access_token=" + access_token)
1515
return result

‎mercadopago/customer.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
from .mercadopagorestclient import MercadoPagoRestClient
22

33
class Customer(MercadoPagoRestClient):
4-
def __init__(self, client_id, client_secret, access_token):
5-
super(Customer, self).__init__(client_id, client_secret, access_token)
4+
def __init__(self, client_id, client_secret, access_token, version):
5+
super(Customer, self).__init__(client_id, client_secret, access_token, version)
66

77
def get(self, id):
88
access_token = self.get_access_token()
9-
result = self.__rest_client.get("/v1/customers/" + id + "?access_token=" + access_token)
9+
result = self.get_rest_client().get("/v1/customers/" + id + "?access_token=" + access_token)
1010
return result
1111

1212
def create(self, customer):
1313
access_token = self.get_access_token()
14-
response = self.__rest_client.post("/v1/customers?access_token=" + access_token, customer)
14+
response = self.get_rest_client().post("/v1/customers?access_token=" + access_token, customer)
1515
return response
1616

1717
def update(self, id, customer):
1818
access_token = self.get_access_token()
19-
response = self.__rest_client.put("/v1/customers/" + id + "?access_token=" + access_token, customer)
19+
response = self.get_rest_client().put("/v1/customers/" + id + "?access_token=" + access_token, customer)
2020
return response
2121

2222
def delete(self, id):
2323
access_token = self.get_access_token()
24-
result = self.__rest_client.delete("/v1/customers/" + id + "?access_token=" + access_token)
24+
result = self.get_rest_client().delete("/v1/customers/" + id + "?access_token=" + access_token)
2525
return result
2626

2727
def search(self, filters):#, offset=0, limit=0
@@ -31,5 +31,5 @@ def search(self, filters):#, offset=0, limit=0
3131
#filters["limit"] = limit
3232
filters["access_token"] = access_token
3333

34-
result = self.__rest_client.get("/v1/customers/search", filters)
34+
result = self.get_rest_client().get("/v1/customers/search", filters)
3535
return result

‎mercadopago/discountcampaign.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from .mercadopagorestclient import MercadoPagoRestClient
22

33
class DiscountCampaign(MercadoPagoRestClient):
4-
def __init__(self, client_id, client_secret, access_token):
5-
super(DiscountCampaign, self).__init__(client_id, client_secret, access_token)
4+
def __init__(self, client_id, client_secret, access_token, version):
5+
super(DiscountCampaign, self).__init__(client_id, client_secret, access_token, version)
66

77
def get(self, transaction_amount, payer_email, coupon_code):
88
access_token = self.get_access_token()
@@ -12,5 +12,5 @@ def get(self, transaction_amount, payer_email, coupon_code):
1212
filters["payer_email"] = payer_email
1313
filters["coupon_code"] = coupon_code
1414

15-
payment_result = self.__rest_client.get("/v1/discount_campaigns", filters)
15+
payment_result = self.get_rest_client().get("/v1/discount_campaigns", filters)
1616
return payment_result

‎mercadopago/genericcall.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from .mercadopagorestclient import MercadoPagoRestClient
22

33
class GenericCall(MercadoPagoRestClient):
4-
def __init__(self, client_id, client_secret, access_token):
5-
super(GenericCall, self).__init__(client_id, client_secret, access_token)
4+
def __init__(self, client_id, client_secret, access_token, version):
5+
super(GenericCall, self).__init__(client_id, client_secret, access_token, version)
66

77
def get(self, uri, params=None, authenticate=True):
88
if params is None:
@@ -12,7 +12,7 @@ def get(self, uri, params=None, authenticate=True):
1212
access_token = self.get_access_token()
1313
params["access_token"] = access_token
1414

15-
result = self.__rest_client.get(uri, params)
15+
result = self.get_rest_client().get(uri, params)
1616
return result
1717

1818
def post(self, uri, data, params=None):
@@ -21,7 +21,7 @@ def post(self, uri, data, params=None):
2121

2222
access_token = self.get_access_token()
2323
params["access_token"] = access_token
24-
result = self.__rest_client.post(uri, data, params)
24+
result = self.get_rest_client().post(uri, data, params)
2525
return result
2626

2727
def put(self, uri, data, params=None):
@@ -30,7 +30,7 @@ def put(self, uri, data, params=None):
3030

3131
access_token = self.get_access_token()
3232
params["access_token"] = access_token
33-
result = self.__rest_client.put(uri, data, params)
33+
result = self.get_rest_client().put(uri, data, params)
3434
return result
3535

3636
def delete(self, uri, params=None):
@@ -39,5 +39,5 @@ def delete(self, uri, params=None):
3939

4040
access_token = self.get_access_token()
4141
params["access_token"] = access_token
42-
result = self.__rest_client.delete(uri, params)
42+
result = self.get_rest_client().delete(uri, params)
4343
return result

‎mercadopago/identificationtype.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from .mercadopagorestclient import MercadoPagoRestClient
22

33
class IdentificationType(MercadoPagoRestClient):
4-
def __init__(self, client_id, client_secret, access_token):
5-
super(IdentificationType, self).__init__(client_id, client_secret, access_token)
4+
def __init__(self, client_id, client_secret, access_token, version):
5+
super(IdentificationType, self).__init__(client_id, client_secret, access_token, version)
66

77
def get(self, id):
88
access_token = self.get_access_token()
9-
result = self.__rest_client.get("/v1/identification_types?access_token=" + access_token)
9+
result = self.get_rest_client().get("/v1/identification_types?access_token=" + access_token)
1010
return result

‎mercadopago/mercadopago.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
class MP(object):
15-
version = "2.0.3"
15+
version = "2.0.4"
1616
__client_id = None
1717
__client_secret = None
1818
__ll_access_token = None
@@ -43,15 +43,15 @@ def __init__(self, *args):
4343
else:
4444
raise MPInvalidCredentials(None)
4545

46-
self.card = Card(self.__client_id, self.__client_secret, self.__ll_access_token)
47-
self.cardtoken = CardToken(self.__client_id, self.__client_secret, self.__ll_access_token)
48-
self.customer = Customer(self.__client_id, self.__client_secret, self.__ll_access_token)
49-
self.payment = Payment(self.__client_id, self.__client_secret, self.__ll_access_token)
50-
self.preference = Preference(self.__client_id, self.__client_secret, self.__ll_access_token)
51-
self.genericcall = GenericCall(self.__client_id, self.__client_secret, self.__ll_access_token)
52-
self.discountcampaign = DiscountCampaign(self.__client_id, self.__client_secret, self.__ll_access_token)
53-
self.identificationtype = IdentificationType(self.__client_id, self.__client_secret, self.__ll_access_token)
54-
self.merchantorder = MerchantOrder(self.__client_id, self.__client_secret, self.__ll_access_token)
46+
self.card = Card(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
47+
self.cardtoken = CardToken(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
48+
self.customer = Customer(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
49+
self.payment = Payment(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
50+
self.preference = Preference(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
51+
self.genericcall = GenericCall(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
52+
self.discountcampaign = DiscountCampaign(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
53+
self.identificationtype = IdentificationType(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
54+
self.merchantorder = MerchantOrder(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
5555

5656
def sandbox_mode(self, enable=None):
5757
if not enable is None:

‎mercadopago/mercadopagorestclient.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .mpinvalidcredentials import MPInvalidCredentials
2-
from .restclient import __RestClient
2+
from .restclient import RestClient
33

44
class MercadoPagoRestClient(object):
55
__access_data = None
@@ -8,11 +8,11 @@ class MercadoPagoRestClient(object):
88
__client_secret = None
99
__rest_client = None
1010

11-
def __init__(self, client_id, client_secret, access_token):
11+
def __init__(self, client_id, client_secret, access_token, version):
1212
self.__client_id = client_id
1313
self.__client_secret = client_secret
1414
self.__ll_access_token = access_token
15-
self.__rest_client = __RestClient(self)
15+
self.__rest_client = RestClient(version)
1616

1717
def get_access_token(self):
1818
if not self.__ll_access_token is None:
@@ -24,10 +24,13 @@ def get_access_token(self):
2424
"grant_type": "client_credentials"
2525
}
2626

27-
access_data = self.__rest_client.post("/oauth/token", None, app_client_values, __RestClient.MIME_FORM)
27+
access_data = self.__rest_client.post("/oauth/token", None, app_client_values, RestClient.MIME_FORM)
2828

2929
if access_data["status"] == 200:
3030
self.__access_data = access_data["response"]
3131
return self.__access_data["access_token"]
3232
else:
33-
raise MPInvalidCredentials(str(access_data))
33+
raise MPInvalidCredentials(str(access_data))
34+
35+
def get_rest_client(self):
36+
return self.__rest_client

‎mercadopago/merchantorder.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
from .mercadopagorestclient import MercadoPagoRestClient
22

33
class MerchantOrder(MercadoPagoRestClient):
4-
def __init__(self, client_id, client_secret, access_token):
5-
super(MerchantOrder, self).__init__(client_id, client_secret, access_token)
4+
def __init__(self, client_id, client_secret, access_token, version):
5+
super(MerchantOrder, self).__init__(client_id, client_secret, access_token, version)
66

77
def create(self, merchant_order):
88
access_token = self.get_access_token()
9-
result = self.__rest_client.post("/merchant_orders?access_token=" + access_token, merchant_order)
9+
result = self.get_rest_client().post("/merchant_orders?access_token=" + access_token, merchant_order)
1010
return result
1111

1212
def update(self, id, merchant_order):
1313
access_token = self.get_access_token()
14-
result = self.__rest_client.put("/merchant_orders/" + id + "?access_token=" + access_token, merchant_order)
14+
result = self.get_rest_client().put("/merchant_orders/" + id + "?access_token=" + access_token, merchant_order)
1515
return result
1616

1717
def get(self, id):
1818
access_token = self.get_access_token()
19-
result = self.__rest_client.get("/merchant_orders/" + id + "?access_token=" + access_token)
19+
result = self.get_rest_client().get("/merchant_orders/" + id + "?access_token=" + access_token)
2020
return result

‎mercadopago/payment.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
from .mercadopagorestclient import MercadoPagoRestClient
22

33
class Payment(MercadoPagoRestClient):
4-
def __init__(self, client_id, client_secret, access_token):
5-
super(Payment, self).__init__(client_id, client_secret, access_token)
4+
def __init__(self, client_id, client_secret, access_token, version):
5+
super(Payment, self).__init__(client_id, client_secret, access_token, version)
66

77
def get(self, id):
88
access_token = self.get_access_token()
99

1010
#uri_prefix = "/sandbox" if MercadoPago.__sandbox else ""
1111

12-
payment_info = self.__rest_client.get("/v1/payments/" + id + "?access_token=" + access_token)
12+
payment_info = self.get_rest_client().get("/v1/payments/" + id + "?access_token=" + access_token)
1313
return payment_info
1414

1515
def get_authorized(self, id):
1616
access_token = self.get_access_token()
17-
authorized_payment_info = self.__rest_client.get("/authorized_payments/" + id + "?access_token=" + access_token)
17+
authorized_payment_info = self.get_rest_client().get("/authorized_payments/" + id + "?access_token=" + access_token)
1818
return authorized_payment_info
1919

2020
def get_refund(self, id):
2121
access_token = self.get_access_token()
22-
response = self.__rest_client.get("/v1/payments/" + id + "/refunds?access_token=" + access_token)
22+
response = self.get_rest_client().get("/v1/payments/" + id + "/refunds?access_token=" + access_token)
2323
return response
2424

2525
def do_refund(self, id):
2626
access_token = self.get_access_token()
2727
refund_status = {}
28-
response = self.__rest_client.post("/v1/payments/" + id + "/refunds?access_token=" + access_token, refund_status)
28+
response = self.get_rest_client().post("/v1/payments/" + id + "/refunds?access_token=" + access_token, refund_status)
2929
return response
3030

3131
def cancel(self, id):
3232
access_token = self.get_access_token()
3333
cancel_status = {"status":"cancelled"}
34-
response = self.__rest_client.put("/v1/payments/" + id + "?access_token=" + access_token, cancel_status)
34+
response = self.get_rest_client().put("/v1/payments/" + id + "?access_token=" + access_token, cancel_status)
3535
return response
3636

3737
def search(self, filters, offset=0, limit=0):
@@ -42,5 +42,5 @@ def search(self, filters, offset=0, limit=0):
4242

4343
#uri_prefix = "/sandbox" if MercadoPago.__sandbox else ""
4444

45-
payment_result = self.__rest_client.get("/v1/payments/search", filters)
45+
payment_result = self.get_rest_client().get("/v1/payments/search", filters)
4646
return payment_result

0 commit comments

Comments
 (0)