diff --git a/mistral_tempest_tests/tests/api/v2/test_action_executions.py b/mistral_tempest_tests/tests/api/v2/test_action_executions.py index a794d4f..efb3698 100644 --- a/mistral_tempest_tests/tests/api/v2/test_action_executions.py +++ b/mistral_tempest_tests/tests/api/v2/test_action_executions.py @@ -12,8 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six - from oslo_log import log as logging from oslo_serialization import jsonutils from tempest.lib import decorators @@ -45,8 +43,7 @@ class ActionExecutionTestsV2(base.TestCase): except Exception as e: LOG.exception( 'Exception raised when deleting ' - 'action_executions %s, error message: %s.', - action_ex, six.text_type(e) + 'action_executions %s, error message: %s.', action_ex, e ) self.client.action_executions = [] diff --git a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_multi_vim_authentication.py b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_multi_vim_authentication.py index cf5b4eb..c2446a7 100644 --- a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_multi_vim_authentication.py +++ b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_multi_vim_authentication.py @@ -16,8 +16,8 @@ import base64 from keystoneclient import service_catalog as ks_service_catalog from oslo_serialization import jsonutils from oslo_utils import uuidutils -from six.moves.urllib.parse import urlparse from tempest.lib import decorators +from urllib.parse import urlparse from mistral_tempest_tests.tests import base diff --git a/mistral_tempest_tests/tests/ssh_utils.py b/mistral_tempest_tests/tests/ssh_utils.py index a8f9feb..582b388 100755 --- a/mistral_tempest_tests/tests/ssh_utils.py +++ b/mistral_tempest_tests/tests/ssh_utils.py @@ -15,7 +15,6 @@ from os import path from oslo_log import log as logging import paramiko -import six KEY_PATH = path.expanduser("~/.ssh/") LOG = logging.getLogger(__name__) @@ -47,7 +46,7 @@ def _to_paramiko_private_key(private_key_filename, password=None): def _connect(host, username, password=None, pkey=None, proxy=None): - if isinstance(pkey, six.string_types): + if isinstance(pkey, str): pkey = _to_paramiko_private_key(pkey, password) LOG.debug('Creating SSH connection to %s', host) diff --git a/requirements.txt b/requirements.txt index d3fa52e..c443092 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,6 @@ oslo.utils>=3.33.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 paramiko>=2.0.0 # LGPLv2.1+ -six>=1.10.0 # MIT mock>=2.0.0 # BSD tempest>=17.1.0 # Apache-2.0 testtools>=2.2.0 # MIT