Merge "Remove usage of six"
This commit is contained in:
commit
044f9c8be5
@ -21,7 +21,6 @@ import re
|
|||||||
from urllib import parse as urlparse
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
import six
|
|
||||||
|
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest.lib.services.identity.v2 import token_client as json_v2id
|
from tempest.lib.services.identity.v2 import token_client as json_v2id
|
||||||
@ -65,8 +64,7 @@ def apply_url_filters(url, filters):
|
|||||||
return url
|
return url
|
||||||
|
|
||||||
|
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
class AuthProvider(object, metaclass=abc.ABCMeta):
|
||||||
class AuthProvider(object):
|
|
||||||
"""Provide authentication"""
|
"""Provide authentication"""
|
||||||
|
|
||||||
SCOPES = set(['project'])
|
SCOPES = set(['project'])
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
import abc
|
import abc
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
import six
|
|
||||||
|
|
||||||
from tempest.lib import auth
|
from tempest.lib import auth
|
||||||
from tempest.lib import exceptions as lib_exc
|
from tempest.lib import exceptions as lib_exc
|
||||||
@ -22,8 +21,7 @@ from tempest.lib.services.identity.v2 import identity_client as v2_identity
|
|||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
class CredsClient(object, metaclass=abc.ABCMeta):
|
||||||
class CredsClient(object):
|
|
||||||
"""This class is a wrapper around the identity clients
|
"""This class is a wrapper around the identity clients
|
||||||
|
|
||||||
to provide a single interface for managing credentials in both v2 and v3
|
to provide a single interface for managing credentials in both v2 and v3
|
||||||
|
@ -14,14 +14,12 @@
|
|||||||
|
|
||||||
import abc
|
import abc
|
||||||
|
|
||||||
import six
|
|
||||||
|
|
||||||
from tempest.lib import auth
|
from tempest.lib import auth
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
|
|
||||||
|
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
class CredentialProvider(object, metaclass=abc.ABCMeta):
|
||||||
class CredentialProvider(object):
|
|
||||||
def __init__(self, identity_version, name=None,
|
def __init__(self, identity_version, name=None,
|
||||||
network_resources=None, credentials_domain=None,
|
network_resources=None, credentials_domain=None,
|
||||||
admin_role=None, identity_uri=None):
|
admin_role=None, identity_uri=None):
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
import abc
|
import abc
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
import six
|
|
||||||
import stevedore
|
import stevedore
|
||||||
|
|
||||||
from tempest.lib.common.utils import misc
|
from tempest.lib.common.utils import misc
|
||||||
@ -24,8 +23,7 @@ from tempest.lib.services import clients
|
|||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
class TempestPlugin(object, metaclass=abc.ABCMeta):
|
||||||
class TempestPlugin(object):
|
|
||||||
"""Provide basic hooks for an external plugin
|
"""Provide basic hooks for an external plugin
|
||||||
|
|
||||||
To provide tempest the necessary information to run the plugin.
|
To provide tempest the necessary information to run the plugin.
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
import abc
|
import abc
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
import six
|
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
from tempest.lib import base as test
|
from tempest.lib import base as test
|
||||||
@ -69,8 +68,7 @@ class TestAttrDecorator(base.TestCase):
|
|||||||
condition=True)
|
condition=True)
|
||||||
|
|
||||||
|
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
class BaseSkipDecoratorTests(object, metaclass=abc.ABCMeta):
|
||||||
class BaseSkipDecoratorTests(object):
|
|
||||||
|
|
||||||
@abc.abstractmethod
|
@abc.abstractmethod
|
||||||
def _test_skip_helper(self, raise_exception=True, expected_to_skip=True,
|
def _test_skip_helper(self, raise_exception=True, expected_to_skip=True,
|
||||||
|
Loading…
Reference in New Issue
Block a user