Remove six

Mostly a find-replace job. Let's do this now so we don't have to carry
it for the next decade.

Change-Id: I7bef9fb7c6895f746cee1aca6522786f38b9857c
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/novaclient/tests/unit/utils.py b/novaclient/tests/unit/utils.py
index 0050941b..229d999e 100644
--- a/novaclient/tests/unit/utils.py
+++ b/novaclient/tests/unit/utils.py
@@ -18,7 +18,6 @@ import mock
 from oslo_serialization import jsonutils
 import requests
 from requests_mock.contrib import fixture as requests_mock_fixture
-import six
 import testscenarios
 import testtools
 
@@ -99,9 +98,9 @@ class FixturedTestCase(testscenarios.TestWithScenarios, TestCase):
 
         if body:
             req_data = self.requests_mock.last_request.body
-            if isinstance(req_data, six.binary_type):
+            if isinstance(req_data, bytes):
                 req_data = req_data.decode('utf-8')
-            if not isinstance(body, six.string_types):
+            if not isinstance(body, str):
                 # json load if the input body to match against is not a string
                 req_data = jsonutils.loads(req_data)
             self.assertEqual(body, req_data)