Merge pull request #62 from mehmetminanc/drop-python2-support

Drop python2 support

Author: marcel corso gonzalez

.gitignore

@@ -59,6 +59,7 @@ target/
 
 # PyCharm
 .idea/
+*.iml
 
 # pyvenv
-venv/
+venv*/

.travis.yml

@@ -1,18 +1,14 @@
 language: python
 python:
-  - 'pypy2.7'
-  - 'pypy3.5'
-  - '2.7'
-  - '3.4'
+  - 'pypy3.6'
+  - 'pypy3.7'
   - '3.6'
+  - '3.7'
+  - '3.8'
+  - '3.9'
   - 'nightly'
 install:
-  - pip install mock==2.0
-  - pip install requests
-  - pip install codecov
-  - pip install pytest pytest-cov
-  - pip install pycodestyle
-  - pip install .
+  - pip install -e .[dev]
 script:
   - coverage run --source=messagebird -m unittest discover -s tests/
   - coverage report --fail-under=80
@@ -21,5 +17,3 @@ script:
 matrix:
   allow_failures:
   - python: 'nightly'
-  - python: 'pypy2.7'
-  - python: 'pypy3.5'

README.md

@@ -35,7 +35,7 @@ import messagebird
 Then, create an instance of **messagebird.Client**:
 
 ```python
-client = messagebird.Client('test_gshuPaZoeEG6ovbc8M79w0QyM')
+client = messagebird.Client('YOUR_ACCESS_KEY')
 ```
 
 Now you can query the API for information or send a request. For example, if we want to request our balance information you'd do something like this:

messagebird/base.py

@@ -4,7 +4,7 @@
 import json
 
 
-class Base(object):
+class Base:
     def load(self, data):
         if data is not None:
             for name, value in list(data.items()):

messagebird/client.py

@@ -25,7 +25,7 @@
 from messagebird.number import Number, NumberList
 
 ENDPOINT = 'https://rest.messagebird.com'
-CLIENT_VERSION = '1.6.0'
+CLIENT_VERSION = '2.0.0'
 PYTHON_VERSION = '%d.%d.%d' % (sys.version_info[0], sys.version_info[1], sys.version_info[2])
 USER_AGENT = 'MessageBird/ApiClient/%s Python/%s' % (CLIENT_VERSION, PYTHON_VERSION)
 REST_TYPE = 'rest'
@@ -62,6 +62,7 @@ def __init__(self, errorMessage):
         super(SignleErrorException, self).__init__(errorMessage)
 
 
+
 class Client(object):
     def __init__(self, access_key, http_client=None):
         self.access_key = access_key

messagebird/http_client.py

@@ -3,18 +3,15 @@
 
 from messagebird.serde import json_serialize
 
-try:
-    from urllib.parse import urljoin
-except ImportError:
-    from urlparse import urljoin
+from urllib.parse import urljoin
 
 
 class ResponseFormat(Enum):
     text = 1
     binary = 2
 
 
-class HttpClient(object):
+class HttpClient:
     """Used for sending simple HTTP requests."""
 
     def __init__(self, endpoint, access_key, user_agent):

messagebird/signed_request.py

@@ -4,10 +4,7 @@
 import time
 from collections import OrderedDict
 
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    from urllib import urlencode
+from urllib.parse import urlencode
 
 
 class SignedRequest:

setup.py

@@ -2,31 +2,38 @@
 from setuptools import setup
 from io import open
 
-def get_description():
-    working_directory = path.abspath(path.dirname(__file__))
-    readme_path = path.join(working_directory, 'README.md')
-    with open(readme_path, encoding='utf-8') as f:
-        return (f.read(), 'text/markdown')
-
-description, description_content_type = get_description()
+with open('README.md', encoding='utf-8') as f:
+    description = f.read()
 
 setup(
     name                          = 'messagebird',
     packages                      = ['messagebird'],
-    version                       = '1.6.0',
+    version                       = '2.0.0',
     description                   = "MessageBird's REST API",
     author                        = 'MessageBird',
     author_email                  = '[email protected]',
     long_description              = description,
-    long_description_content_type = description_content_type,
+    long_description_content_type = 'text/markdown',
     url                           = 'https://github.com/messagebird/python-rest-api',
-    download_url                  = 'https://github.com/messagebird/python-rest-api/tarball/1.6.0',
+    download_url                  = 'https://github.com/messagebird/python-rest-api/tarball/2.0.0',
     keywords                      = ['messagebird', 'sms'],
     install_requires              = ['requests>=2.4.1', 'python-dateutil>=2.6.0'],
+    extras_require               = {
+        'dev': [
+            'pytest',
+            'pytest-cov',
+            'mock>=2.0',
+            'codecov',
+            'pycodestyle',
+        ]
+    },
     license                       = 'BSD-2-Clause',
     classifiers                   = [
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Operating System :: OS Independent',
     ],
 )

tests/test_balance.py

@@ -1,12 +1,7 @@
 import unittest
-from messagebird import Client
+from unittest.mock import Mock
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird import Client
 
 
 class TestBalance(unittest.TestCase):

tests/test_call.py

@@ -1,15 +1,9 @@
 import json
 import unittest
-from messagebird import Client, ErrorException
+from unittest.mock import Mock
+
+from messagebird import Client
 from messagebird.base import Base
-from messagebird.client import VOICE_TYPE
-
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
 
 
 class TestCall(unittest.TestCase):

tests/test_call_flow.py

@@ -1,12 +1,7 @@
 import unittest
-from messagebird import Client
+from unittest.mock import Mock
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird import Client
 
 
 class TestCallFlow(unittest.TestCase):

tests/test_contact.py

@@ -1,12 +1,7 @@
 import unittest
-from messagebird import Client, ErrorException
+from unittest.mock import Mock
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird import Client, ErrorException
 
 
 class TestContact(unittest.TestCase):

tests/test_conversation.py

@@ -1,17 +1,11 @@
 import unittest
 from datetime import datetime
+from unittest.mock import Mock
 
 from dateutil.tz import tzutc
 
 from messagebird import Client
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
-
 
 class TestConversation(unittest.TestCase):
 

tests/test_conversation_message.py

@@ -1,17 +1,11 @@
 import unittest
 from datetime import datetime
+from unittest.mock import Mock
 
 from dateutil.tz import tzutc
 
 from messagebird import Client
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
-
 
 class TestConversationMessage(unittest.TestCase):
 

tests/test_conversation_webhook.py

@@ -1,6 +1,7 @@
-import unittest
 import json
+import unittest
 from datetime import datetime
+from unittest.mock import Mock
 
 from dateutil.tz import tzutc
 
@@ -9,13 +10,6 @@
     CONVERSATION_WEBHOOK_EVENT_CONVERSATION_CREATED, \
     CONVERSATION_WEBHOOK_EVENT_CONVERSATION_UPDATED
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
-
 
 class TestConversationWebhook(unittest.TestCase):
 

tests/test_group.py

@@ -1,12 +1,7 @@
 import unittest
-from messagebird import Client
+from unittest.mock import Mock
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird import Client
 
 
 class TestGroup(unittest.TestCase):

tests/test_hlr.py

@@ -1,12 +1,7 @@
 import unittest
-from messagebird import Client
+from unittest.mock import Mock
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird import Client
 
 
 class TestHLR(unittest.TestCase):

tests/test_lookup.py

@@ -1,12 +1,7 @@
 import unittest
-from messagebird import Client
+from unittest.mock import Mock
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird import Client
 
 
 class TestLookup(unittest.TestCase):

tests/test_message.py

@@ -1,12 +1,7 @@
 import unittest
-from messagebird import Client, ErrorException
+from unittest.mock import Mock
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird import Client, ErrorException
 
 
 class TestMessage(unittest.TestCase):

tests/test_mms.py

@@ -1,12 +1,7 @@
 import unittest
-from messagebird import Client
+from unittest.mock import Mock
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird import Client
 
 
 class TestMMS(unittest.TestCase):

tests/test_number.py

@@ -1,12 +1,7 @@
 import unittest
-from messagebird import Client, ErrorException
+from unittest.mock import Mock
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird import Client, ErrorException
 
 
 class TestNumber(unittest.TestCase):

tests/test_signed_request.py

@@ -1,13 +1,7 @@
-import unittest
 import time
-from messagebird.signed_request import SignedRequest
+import unittest
 
-try:
-    from unittest.mock import Mock
-except ImportError:
-    # mock was added to unittest in Python 3.3, but was an external library
-    # before.
-    from mock import Mock
+from messagebird.signed_request import SignedRequest
 
 SIGNING_KEY = 'PlLrKaqvZNRR5zAjm42ZT6q1SQxgbbGd'