Merge "Use six.add_metaclass instead of __metaclass__"

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 74f7289..6efcf23 100644
--- a/cliff/display.py
+++ b/cliff/display.py
@@ -13,6 +13,7 @@ except ImportError:
 
 import logging
 
+import six
 import stevedore
 
 from .command import Command
@@ -21,10 +22,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 1e01a3a..6cf79a2 100644
--- a/cliff/lister.py
+++ b/cliff/lister.py
@@ -3,16 +3,18 @@
 import abc
 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 36c4bd4..fb01068 100644
--- a/cliff/show.py
+++ b/cliff/show.py
@@ -3,16 +3,18 @@
 import abc
 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):