diff options
author | Christian Berendt <berendt@b1-systems.de> | 2014-06-03 08:04:44 +0200 |
---|---|---|
committer | Christian Berendt <berendt@b1-systems.de> | 2014-06-03 11:03:48 +0200 |
commit | 9315a324773361e1b27e91833157d6bf528aa20b (patch) | |
tree | a64a2a4fced445b86effe33f4fb68f8fd961f10e | |
parent | 4bdf5fc90ee3e84ac675f5f26f7a0d94aacf91c5 (diff) | |
download | cliff-9315a324773361e1b27e91833157d6bf528aa20b.tar.gz |
Use six.add_metaclass instead of __metaclass__
According to http://docs.openstack.org/developer/hacking/ it should
be preferred to use six.add_metaclass instead of __metaclass__.
Change-Id: I33a0d1b0a0a31beacc8c768eb18fac3cb9ed5936
-rw-r--r-- | cliff/command.py | 5 | ||||
-rw-r--r-- | cliff/display.py | 3 | ||||
-rw-r--r-- | cliff/formatters/base.py | 8 | ||||
-rw-r--r-- | cliff/lister.py | 4 | ||||
-rw-r--r-- | cliff/show.py | 4 |
5 files changed, 16 insertions, 8 deletions
diff --git a/cliff/command.py b/cliff/command.py index 116ae5c..7dfe749 100644 --- a/cliff/command.py +++ b/cliff/command.py @@ -3,15 +3,16 @@ import abc import argparse import inspect +import six + +@six.add_metaclass(abc.ABCMeta) class Command(object): """Base class for command plugins. :param app: Application instance invoking the command. :paramtype app: cliff.app.App """ - __metaclass__ = abc.ABCMeta - def __init__(self, app, app_args): self.app = app self.app_args = app_args diff --git a/cliff/display.py b/cliff/display.py index e04fd29..e10ec8f 100644 --- a/cliff/display.py +++ b/cliff/display.py @@ -3,6 +3,7 @@ import abc import logging +import six import stevedore from .command import Command @@ -11,10 +12,10 @@ from .command import Command LOG = logging.getLogger(__name__) +@six.add_metaclass(abc.ABCMeta) class DisplayCommandBase(Command): """Command base class for displaying data about a single object. """ - __metaclass__ = abc.ABCMeta def __init__(self, app, app_args): super(DisplayCommandBase, self).__init__(app, app_args) diff --git a/cliff/formatters/base.py b/cliff/formatters/base.py index 43b8f17..c477a54 100644 --- a/cliff/formatters/base.py +++ b/cliff/formatters/base.py @@ -3,9 +3,11 @@ import abc +import six + +@six.add_metaclass(abc.ABCMeta) class Formatter(object): - __metaclass__ = abc.ABCMeta @abc.abstractmethod def add_argument_group(self, parser): @@ -15,10 +17,10 @@ class Formatter(object): """ +@six.add_metaclass(abc.ABCMeta) class ListFormatter(Formatter): """Base class for formatters that know how to deal with multiple objects. """ - __metaclass__ = abc.ABCMeta @abc.abstractmethod def emit_list(self, column_names, data, stdout, parsed_args): @@ -32,10 +34,10 @@ class ListFormatter(Formatter): """ +@six.add_metaclass(abc.ABCMeta) class SingleFormatter(Formatter): """Base class for formatters that work with single objects. """ - __metaclass__ = abc.ABCMeta @abc.abstractmethod def emit_one(self, column_names, data, stdout, parsed_args): diff --git a/cliff/lister.py b/cliff/lister.py index 1b6c3b6..863584f 100644 --- a/cliff/lister.py +++ b/cliff/lister.py @@ -13,16 +13,18 @@ except ImportError: import logging +import six + from .display import DisplayCommandBase LOG = logging.getLogger(__name__) +@six.add_metaclass(abc.ABCMeta) class Lister(DisplayCommandBase): """Command base class for providing a list of data as output. """ - __metaclass__ = abc.ABCMeta @property def formatter_namespace(self): diff --git a/cliff/show.py b/cliff/show.py index 855b2d2..00fd4ff 100644 --- a/cliff/show.py +++ b/cliff/show.py @@ -4,16 +4,18 @@ import abc import itertools import logging +import six + from .display import DisplayCommandBase LOG = logging.getLogger(__name__) +@six.add_metaclass(abc.ABCMeta) class ShowOne(DisplayCommandBase): """Command base class for displaying data about a single object. """ - __metaclass__ = abc.ABCMeta @property def formatter_namespace(self): |