* Removes Python2 imports from the tests.

Author: max-inanc

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):