Release Version 1.2.0

Author: victorgodinho-meli

MANIFEST.in

@@ -69,4 +69,4 @@ If you require technical support, please contact our support team at [developers
 ```
 MIT license. Copyright (c) 2018 - Mercado Pago / Mercado Libre 
 For more information, see the LICENSE file.
-```
+```

README.md

@@ -1,45 +1,41 @@
-"""
-MercadoPago Integration Library
-Access MercadoPago for payments integration
+from .mpinvalidcredentials import MPInvalidCredentials
 
-@author hcasatti
-"""
-
-from json.encoder import JSONEncoder
-import requests
-
-from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.poolmanager import PoolManager
-
-import platform
-import ssl
-import sys
-
-class MPSSLAdapter(HTTPAdapter):
-    def init_poolmanager(self, connections, maxsize, block=False):
-        self.poolmanager = PoolManager(num_pools=connections,
-                                       maxsize=maxsize,
-                                       block=block)
-
-class MPException(Exception):
-    def __init__(self, value):
-        self.value = value
-
-    def __repr__(self):
-        return self.value
-
-class MPInvalidCredentials(MPException):
-    pass
+from .card import Card
+from .cardtoken import CardToken
+from .customer import Customer
+from .payment import Payment
+from .preference import Preference
+from .genericcall import GenericCall
+from .discountcampaign import DiscountCampaign
+from .identificationtype import IdentificationType
+from .merchantorder import MerchantOrder
 
 
 class MP(object):
+<<<<<<< HEAD
     version = "1.2.0"
     __access_data = None
     __ll_access_token = None
     __sandbox = False
     platform_id = None
     integrator_id = None
     corporation_id = None
+=======
+    version = "2.0.4"
+    __client_id = None
+    __client_secret = None
+    __ll_access_token = None
+    __sandbox = False
+    card = None
+    cardtoken = None
+    customer = None
+    payment = None
+    preference = None
+    genericcall = None
+    discountcampaign = None
+    identificationtype = None
+    merchantorder = None
+>>>>>>> 346b4c6d7c8c2cbe8dc6e9e8613816f233152ca6
 
     def __init__(self, *args):
         """
@@ -57,13 +53,22 @@ def __init__(self, *args):
         else:
             raise MPInvalidCredentials(None)
 
-        self.__rest_client = self.__RestClient(self)
+        self.card = Card(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
+        self.cardtoken = CardToken(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
+        self.customer = Customer(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
+        self.payment = Payment(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
+        self.preference = Preference(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
+        self.genericcall = GenericCall(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
+        self.discountcampaign = DiscountCampaign(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
+        self.identificationtype = IdentificationType(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
+        self.merchantorder = MerchantOrder(self.__client_id, self.__client_secret, self.__ll_access_token, self.version)
 
     def sandbox_mode(self, enable=None):
         if not enable is None:
             self.__sandbox = enable == True
 
         return self.__sandbox
+<<<<<<< HEAD
 
     def get_access_token(self):
         if not self.__ll_access_token is None:
@@ -373,3 +378,5 @@ def delete(self, uri, params=None):
             }
 
             return response
+=======
+>>>>>>> 346b4c6d7c8c2cbe8dc6e9e8613816f233152ca6

mercadopago/mercadopago.py

@@ -3,12 +3,14 @@
 
 from distutils.core import Command
 
+
 class Tests(Command):
-    '''run tests'''
+    """run tests"""
 
-    description = 'runs unittest to execute all tests'
+    description = "runs unittest to execute all tests"
 
     user_options = []
+
     def initialize_options(self):
         pass
 
@@ -17,9 +19,10 @@ def finalize_options(self):
 
     def run(self):
         import unittest
+
         runner = unittest.runner.TextTestRunner()
         test_loader = unittest.TestLoader()
-        test = test_loader.discover('tests')
+        test = test_loader.discover("tests")
         runner.run(test)
 
 
@@ -36,13 +39,13 @@ def run(self):
     install_requires='requests>=2.4.3',
     cmdclass = {'test': Tests},
     classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 3.4',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-        'License :: Freely Distributable',
-    ]
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 3.4",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        "License :: Freely Distributable",
+    ],
 )