Py3: Remove six
Remove six.add_metaclass usage in taas code. Change-Id: I73bb6d75b6608ad8fed05bc54f497abb1ca50ff1
This commit is contained in:
parent
1ff8830e5c
commit
fc72381ad6
@ -23,8 +23,6 @@ from neutron.api.v2 import resource_helper
|
|||||||
|
|
||||||
from neutron_taas.common import config
|
from neutron_taas.common import config
|
||||||
|
|
||||||
import six
|
|
||||||
|
|
||||||
|
|
||||||
config.register()
|
config.register()
|
||||||
|
|
||||||
@ -53,8 +51,7 @@ class Taas(extensions.APIExtensionDescriptor):
|
|||||||
return TaasPluginBase
|
return TaasPluginBase
|
||||||
|
|
||||||
|
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
class TaasPluginBase(service_base.ServicePluginBase, metaclass=abc.ABCMeta):
|
||||||
class TaasPluginBase(service_base.ServicePluginBase):
|
|
||||||
|
|
||||||
def get_plugin_description(self):
|
def get_plugin_description(self):
|
||||||
return taas_api_def.DESCRIPTION
|
return taas_api_def.DESCRIPTION
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import abc
|
import abc
|
||||||
import six
|
|
||||||
|
|
||||||
from neutron_lib.agent import l2_extension
|
from neutron_lib.agent import l2_extension
|
||||||
|
|
||||||
@ -35,8 +34,7 @@ OPTS = [
|
|||||||
cfg.CONF.register_opts(OPTS)
|
cfg.CONF.register_opts(OPTS)
|
||||||
|
|
||||||
|
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
class TaasAgentDriver(object, metaclass=abc.ABCMeta):
|
||||||
class TaasAgentDriver(object):
|
|
||||||
"""Defines stable abstract interface for TaaS Agent Driver."""
|
"""Defines stable abstract interface for TaaS Agent Driver."""
|
||||||
|
|
||||||
@abc.abstractmethod
|
@abc.abstractmethod
|
||||||
|
@ -14,11 +14,8 @@
|
|||||||
|
|
||||||
import abc
|
import abc
|
||||||
|
|
||||||
import six
|
|
||||||
|
|
||||||
|
class TaasBaseDriver(object, metaclass=abc.ABCMeta):
|
||||||
@six.add_metaclass(abc.ABCMeta)
|
|
||||||
class TaasBaseDriver(object):
|
|
||||||
|
|
||||||
def __init__(self, service_plugin):
|
def __init__(self, service_plugin):
|
||||||
self.service_plugin = service_plugin
|
self.service_plugin = service_plugin
|
||||||
|
Loading…
x
Reference in New Issue
Block a user