From aea63db390d222069469ca8b576e7e6afc6a8562 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 17 Feb 2024 11:59:36 +0900 Subject: [PATCH] Remove six from functional tests This is part of the steps to remove usage of six library, which is no longer needed since python 2 support was removed. Change-Id: Ic0b3687c47b6f3ac51858084bcf11a5c5a185759 --- magnum/tests/functional/common/client.py | 6 ++---- magnum/tests/functional/python_client_base.py | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/magnum/tests/functional/common/client.py b/magnum/tests/functional/common/client.py index d61c8da8b4..f8a7bb6e0e 100644 --- a/magnum/tests/functional/common/client.py +++ b/magnum/tests/functional/common/client.py @@ -11,16 +11,14 @@ # under the License. import abc +from urllib import parse -import six -from six.moves.urllib import parse from tempest.lib.common import rest_client from magnum.tests.functional.common import config -@six.add_metaclass(abc.ABCMeta) -class MagnumClient(rest_client.RestClient): +class MagnumClient(rest_client.RestClient, metaclass=abc.ABCMeta): """Abstract class responsible for setting up auth provider""" def __init__(self, auth_provider): diff --git a/magnum/tests/functional/python_client_base.py b/magnum/tests/functional/python_client_base.py index 5debe69b4b..ce0dadb1f7 100644 --- a/magnum/tests/functional/python_client_base.py +++ b/magnum/tests/functional/python_client_base.py @@ -17,14 +17,13 @@ test_magnum Tests for `magnum` module. """ +import configparser import os import subprocess import tempfile import time import fixtures -from six.moves import configparser - from heatclient import client as heatclient from keystoneauth1.identity import v3 as ksa_v3 from keystoneauth1 import session as ksa_session