From 359a18be694750a1725f72c7d5cb53c62a37e129 Mon Sep 17 00:00:00 2001
From: Jordan Cazamias <jordan.cazamias@rackspace.com>
Date: Wed, 18 Jun 2014 12:49:07 -0500
Subject: [PATCH] Fix style error H236

H236: Python 3.x incompatible __metaclass__,
      use six.add_metaclass()

Change-Id: I985bee23b7c81c44e4e40e3f90abd9d21e62c526
Implements: blueprint new-hacking-style-rules
---
 designate/plugin.py       | 5 +++--
 designate/quota/base.py   | 5 ++++-
 designate/storage/base.py | 3 ++-
 tox.ini                   | 3 +--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/designate/plugin.py b/designate/plugin.py
index 7d175c9f..5ceaf7e1 100644
--- a/designate/plugin.py
+++ b/designate/plugin.py
@@ -14,6 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import abc
+
+import six
 from stevedore import driver
 from stevedore import enabled
 from designate.openstack.common import log as logging
@@ -22,9 +24,8 @@ from designate.openstack.common import log as logging
 LOG = logging.getLogger(__name__)
 
 
+@six.add_metaclass(abc.ABCMeta)
 class Plugin(object):
-    __metaclass__ = abc.ABCMeta
-
     __plugin_ns__ = None
 
     __plugin_name__ = None
diff --git a/designate/quota/base.py b/designate/quota/base.py
index 712b89e6..f9bbb0f7 100644
--- a/designate/quota/base.py
+++ b/designate/quota/base.py
@@ -14,14 +14,17 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import abc
+
+import six
+
 from oslo.config import cfg
 from designate import exceptions
 from designate.plugin import DriverPlugin
 
 
+@six.add_metaclass(abc.ABCMeta)
 class Quota(DriverPlugin):
     """ Base class for quota plugins """
-    __metaclass__ = abc.ABCMeta
     __plugin_ns__ = 'designate.quota'
     __plugin_type__ = 'quota'
 
diff --git a/designate/storage/base.py b/designate/storage/base.py
index e2dc6e35..280094d1 100644
--- a/designate/storage/base.py
+++ b/designate/storage/base.py
@@ -14,13 +14,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import abc
+import six
 from designate.plugin import DriverPlugin
 
 
+@six.add_metaclass(abc.ABCMeta)
 class Storage(DriverPlugin):
 
     """ Base class for storage plugins """
-    __metaclass__ = abc.ABCMeta
     __plugin_ns__ = 'designate.storage'
     __plugin_type__ = 'storage'
 
diff --git a/tox.ini b/tox.ini
index 6dd1bc02..69120d12 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,6 @@ commands = {posargs}
 
 # TODO: The following ignored codes need review
 # H104 file contains nothing more than comments
-# H236 Python 3.x incompatible __metaclass__, use six.add_metaclass()
 # H305 imports not grouped correctly
 # H307 like imports should be grouped together
 # H405 multi line docstring summary not separated with an empty line
@@ -48,7 +47,7 @@ commands = {posargs}
 # E128 continuation line under-indented for visual indent
 # E251 unexpected spaces around keyword / parameter equals
 # E265 Block comment should start with '# '
-ignore = H104,H236,H302,H305,H306,H307,H401,H402,H404,H405,H904,E111,E126,E128,E251,E265
+ignore = H104,H302,H305,H306,H307,H401,H402,H404,H405,H904,E111,E126,E128,E251,E265
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*openstack/deprecated*,*lib/python*,*egg,build,tools