Remove python 2 compatability

6 files changed, 7 insertions, 7 deletions

diff --git a/tests/test_pandora/test_client.py b/tests/test_pandora/test_client.py
index d24ea28..5bd200c 100644
--- a/tests/test_pandora/test_client.py
+++ b/tests/test_pandora/test_client.py
@@ -1,9 +1,9 @@
 from unittest import TestCase
+from unittest.mock import Mock, call, patch
 
 from pandora import errors
 from pandora.models.pandora import AdItem, AdditionalAudioUrl
 from pandora.client import APIClient, BaseAPIClient
-from pandora.py2compat import Mock, call, patch
 from tests.test_pandora.test_models import TestAdItem
 
 
diff --git a/tests/test_pandora/test_clientbuilder.py b/tests/test_pandora/test_clientbuilder.py
index 0105c09..af0e219 100644
--- a/tests/test_pandora/test_clientbuilder.py
+++ b/tests/test_pandora/test_clientbuilder.py
@@ -1,8 +1,8 @@
 import os
 from unittest import TestCase
+from unittest.mock import Mock
 
 import pandora.clientbuilder as cb
-from pandora.py2compat import Mock
 from pandora.client import APIClient
 from pandora.transport import DEFAULT_API_HOST
 
diff --git a/tests/test_pandora/test_models.py b/tests/test_pandora/test_models.py
index 410b0de..13ca366 100644
--- a/tests/test_pandora/test_models.py
+++ b/tests/test_pandora/test_models.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 from datetime import datetime
-from pandora.py2compat import Mock, patch
+from unittest.mock import Mock, patch
 
 from pandora.client import APIClient
 from pandora.errors import ParameterMissing
@@ -21,7 +21,7 @@ class TestField(TestCase):
 
 class TestModelMetaClass(TestCase):
 
-    class TestModel(m.with_metaclass(m.ModelMetaClass, object)):
+    class TestModel(object, metaclass=m.ModelMetaClass):
 
         foo = "bar"
         a_field = m.Field("testing")
diff --git a/tests/test_pandora/test_transport.py b/tests/test_pandora/test_transport.py
index ff9c572..862a12f 100644
--- a/tests/test_pandora/test_transport.py
+++ b/tests/test_pandora/test_transport.py
@@ -4,7 +4,7 @@ import json
 import random
 import requests
 from unittest import TestCase
-from pandora.py2compat import Mock, call, patch
+from unittest.mock import Mock, call, patch
 
 from pandora.errors import InvalidAuthToken, PandoraException
 from tests.test_pandora.test_clientbuilder import TestSettingsDictBuilder
diff --git a/tests/test_pandora/test_util.py b/tests/test_pandora/test_util.py
index 2b4ca83..d8c3876 100644
--- a/tests/test_pandora/test_util.py
+++ b/tests/test_pandora/test_util.py
@@ -1,6 +1,6 @@
 import warnings
 from unittest import TestCase
-from pandora.py2compat import patch
+from unittest.mock import patch
 
 from pandora import util
 
diff --git a/tests/test_pydora/test_utils.py b/tests/test_pydora/test_utils.py
index 9900913..5dca83c 100644
--- a/tests/test_pydora/test_utils.py
+++ b/tests/test_pydora/test_utils.py
@@ -1,9 +1,9 @@
 from unittest import TestCase
+from unittest.mock import Mock, patch
 
 from pandora.client import APIClient
 from pandora.errors import InvalidAuthToken, ParameterMissing
 from pandora.models.pandora import Station, AdItem, PlaylistItem
-from pandora.py2compat import Mock, patch
 from pydora.utils import iterate_forever