remove python2 support from awxkit

awxkit/test/cli/test_options.py

@@ -1,10 +1,7 @@
 import argparse
 import json
 import unittest
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from io import StringIO
 
 import pytest
 from requests import Response

awxkit/test/test_credentials.py

@@ -1,7 +1,4 @@
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from unittest.mock import patch
 import pytest
 
 

awxkit/test/test_utils.py

@@ -2,12 +2,8 @@
 from datetime import datetime
 import sys
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 import pytest
-import six
 
 from awxkit import utils
 from awxkit import exceptions as exc
@@ -83,7 +79,7 @@ def test_load_invalid_json_or_yaml(inp):
     reason='this is only intended to be used in py3, not the CLI'
 )
 def test_random_titles_are_unicode(non_ascii):
-    assert isinstance(utils.random_title(non_ascii=non_ascii), six.text_type)
+    assert isinstance(utils.random_title(non_ascii=non_ascii), str)
 
 
 @pytest.mark.parametrize('non_ascii', [True, False])

awxkit/test/test_ws.py

@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
 from collections import namedtuple
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from unittest.mock import patch
 import pytest
 
 from awxkit.ws import WSClient