Merge pull request #34 from todorDim/master

Add support for domain specific api url, update requests module, remove python 2.6 support

Author: eboisgon

.gitignore

@@ -27,4 +27,6 @@ pip-delete-this-directory.txt
 .cache
 nosetests.xml
 coverage.xml
-junit*
+junit*
+build/
+dist/

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-- '2.6'
 - '2.7'
 - '3.5'
 - '3.6'

mailjet_rest/client.py

@@ -12,17 +12,17 @@
 
 
 class Config(object):
-    API_URL = 'https://api.mailjet.com/'
+    DEFAULT_API_URL = 'https://api.eu.mailjet.com/'
     API_REF = 'http://dev.mailjet.com/email-api/v3/'
     version = 'v3'
     user_agent = 'mailjet-apiv3-python/v' + get_version()
 
-    def __init__(self, version=None):
+    def __init__(self, version=None, api_url=None):
         if version is not None:
             self.version = version
+        self.api_url = api_url or self.DEFAULT_API_URL
 
     def __getitem__(self, key):
-        url = self.API_URL[0:]
         # Append version to URL.
         # Forward slash is ignored if present in self.version.
         url = urljoin(url, self.version + '/')
@@ -75,7 +75,8 @@ class Client(object):
     def __init__(self, auth=None, **kwargs):
         self.auth = auth
         version = kwargs.get('version', None)
-        self.config = Config(version=version)
+        api_url = kwargs.get('api_url', None)
+        self.config = Config(version=version, api_url=api_url)
 
     def __getattr__(self, name):
         split = name.split('_')

mailjet_rest/utils/version.py

@@ -1,4 +1,4 @@
-VERSION = (1, 3, 2)
+VERSION = (1, 3, 3)
 
 
 def get_version(version=None):

requirements.txt

@@ -1 +1 @@
-requests==2.17.3
+requests==2.21.0

setup.py

@@ -7,6 +7,9 @@
 HERE = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = 'mailjet_rest'
 
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
 # Dynamically calculate the version based on mailjet_rest.VERSION.
 version = __import__('mailjet_rest').get_version()
 
@@ -20,13 +23,14 @@
     download_url='https://github.com/mailjet/mailjet-apiv3-python/releases/tag/v' + version,
     url='https://github.com/mailjet/mailjet-apiv3-python',
     description=('Mailjet V3 API wrapper'),
-    classifiers=['Development Status :: 3 - Alpha',
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    classifiers=['Development Status :: 4 - Beta',
                  'Environment :: Console',
                  'Intended Audience :: Developers',
                  'License :: OSI Approved :: GNU General Public License (GPL)',
                  'Natural Language :: English',
                  'Operating System :: OS Independent',
-                 'Programming Language :: Python :: 2.6',
                  'Programming Language :: Python :: 2.7',
                  'Programming Language :: Python :: 3.5',
                  'Programming Language :: Python :: 3.6',