test bug fix

Author: Guillaume Badi

mailjet/client.py

@@ -132,31 +132,7 @@ def parse_response(response, debug=False):
         logging.debug('RESPONSE: %s' % response.content)
         logging.debug('RESP_HEADERS: %s' % response.headers)
         logging.debug('RESP_CODE: %s' % response.status_code)
-
-    # if response.status_code > 300:
-    #     errors = data
-    #     exc_data = dict(message=errors.get('ErrorMessage', None),
-    #                     info=errors.get('ErrorInfo', None),
-    #                     response_parsed=data,
-    #                     response=response,
-    #                     request=response.request,
-    #                     )
-    #
-    # if response.status_code == 401:
-    #     raise AuthorizationError(exc_data)
-    # elif response.status_code == 403:
-    #     raise ActionDeniedError(exc_data)
-    # elif response.status_code == 404:
-    #     raise DoesNotExistError(exc_data)
-    # elif response.status_code == 422:
-    #     raise ValidationError(exc_data)
-    # elif response.status_code >= 500:
-    #     logging.error('Critical API error', exc_info=True, extra=exc_data)
-    #     raise CriticalApiError(errors)
-    # elif response.status_code >= 400:
-    #     logging.error('API error', exc_info=True, extra=exc_data)
-    #     raise ApiError(exc_data)
-
+        
     return data
 
 

setup.py

@@ -7,42 +7,22 @@
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
 
-HERE = os.path.abspath(os.path.dirname(__file__))
-PACKAGE_NAME = 'mailjet'
-
-with open(os.path.join(HERE, 'README.md')) as fp:
-    README = fp.read()
-with open(os.path.join(HERE, PACKAGE_NAME, '__init__.py')) as fp:
-    VERSION = re.search("__version__ = '([^']+)'", fp.read()).group(1)
-
-
-class PyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
+with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme:
+    README = readme.read()
 
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = []
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        #import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
+HERE = os.path.abspath(os.path.dirname(__file__))
+PACKAGE_NAME = 'mailjet-rest'
+VERSION = 'v1.0.0'
 
 setup(
     name=PACKAGE_NAME,
     version=VERSION,
     author='starenka',
     author_email='[email protected]',
-    maintainer='starenka',
-    maintainer_email='starenka0gmail.com',
-    url='https://FIXME',
-    description=('Simple Mailjet V3 API wrapper'),
+    maintainer='Guillaume Badi',
+    maintainer_email='gbadi@mailjet.com',
+    url='https://github.com/mailjet/mailjet-apiv3-python',
+    description=('Mailjet V3 API wrapper'),
     long_description=README,
     classifiers=['Development Status :: 3 - Alpha',
                  'Environment :: Console',
@@ -52,15 +32,13 @@ def run_tests(self):
                  'Operating System :: OS Independent',
                  'Programming Language :: Python :: 2.6',
                  'Programming Language :: Python :: 2.7',
+                 'Programming Language :: Python :: 3.2',
                  'Topic :: Utilities'],
     license='GPLv3',
-    keywords='mailjet api wrapper',
+    keywords='mailjet api wrapper email client',
 
-    packages=[PACKAGE_NAME],
-    package_data={'': ['README.md', 'tests', '*.ini'], PACKAGE_NAME: []},
     include_package_data=True,
     install_requires=['requests>=2.4.3'],
-    tests_require=['pytest'],
-    cmdclass = {'test': PyTest},
+    tests_require=['unittest'],
     entry_points={},
 )

test.py

@@ -1,42 +1,42 @@
 import unittest
-from mailjet import Client
+import mailjet.client
 import os
 
 API_KEY = os.environ['MJ_APIKEY_PUBLIC']
 API_SECRET = os.environ['MJ_APIKEY_PRIVATE']
 
-mailjet = Client(auth=(API_KEY, API_SECRET))
+mj = mailjet.Client(auth=(API_KEY, API_SECRET))
 
 class TestSuite(unittest.TestCase):
 
     def test_get_no_param(self):
-        result = mailjet.contact.get().json()
+        result = mj.contact.get().json()
         self.failUnless(('Data' in result and 'Count' in result))
 
     def test_get_valid_params(self):
-        result = mailjet.contact.get(filters={'limit': 2}).json()
+        result = mj.contact.get(filters={'limit': 2}).json()
         self.failUnless('Count' in result and result['Count'] is 2)
 
     def test_get_invalid_parameters(self):
         # invalid parameters are ignored
-        result = mailjet.contact.get(filters={'invalid': 'false'}).json()
+        result = mj.contact.get(filters={'invalid': 'false'}).json()
         self.failUnless('Count' in result)
 
     def test_get_with_data(self):
         # it shouldn't use data
-        result = mailjet.contact.get(data={'name': 'guillaume'}).json()
+        result = mj.contact.get(data={'name': 'guillaume'}).json()
         self.failUnless('Count' in result)
 
     def test_get_with_action(self):
-        result = mailjet.contact_getcontactslists.get(id=2).json()
+        result = mj.contact_getcontactslists.get(id=2).json()
         self.failUnless('Count' in result)
 
     def test_get_with_id_filter(self):
-        result = mailjet.contact.get(filter={'id': 2}).json()
+        result = mj.contact.get(filter={'id': 2}).json()
         self.failUnless('Count' in result)
 
     def test_post_with_no_param(self):
-        result = mailjet.sender.create(data={}).json()
+        result = mj.sender.create(data={}).json()
         self.failUnless('StatusCode' in result and result['StatusCode'] is not 400)