From 1a6e18eb45d5fb1c63d2f1b14be9e6f1e106282b Mon Sep 17 00:00:00 2001
From: Steven Gonzales <stevendgonzales@gmail.com>
Date: Mon, 12 May 2014 07:04:42 -0500
Subject: [PATCH] Metaclass Python 3.x Compatibility

According to the OpenStack style guide (http://docs.openstack.org/developer/hacking/), for Python 3.x compatibility use "six.add_metaclass" instead of " __metaclass__."

Change-Id: Ic7733a22294ecad30d185851d4f550f1386581fc
---
 barbican/common/validators.py | 2 +-
 barbican/crypto/plugin.py     | 4 ++--
 barbican/tasks/resources.py   | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/barbican/common/validators.py b/barbican/common/validators.py
index d1544ff24..666e4db65 100644
--- a/barbican/common/validators.py
+++ b/barbican/common/validators.py
@@ -39,10 +39,10 @@ def get_invalid_property(validation_error):
         return validation_error.schema_path[1]
 
 
+@six.add_metaclass(abc.ABCMeta)
 class ValidatorBase(object):
     """Base class for validators."""
 
-    __metaclass__ = abc.ABCMeta
     name = ''
 
     @abc.abstractmethod
diff --git a/barbican/crypto/plugin.py b/barbican/crypto/plugin.py
index 7bcee3a4c..80ef0e963 100644
--- a/barbican/crypto/plugin.py
+++ b/barbican/crypto/plugin.py
@@ -18,6 +18,7 @@ import abc
 from Crypto.Cipher import AES
 from Crypto import Random
 from oslo.config import cfg
+import six
 
 from barbican.openstack.common.gettextutils import _
 
@@ -121,11 +122,10 @@ def indicate_bind_completed(kek_meta_dto, kek_datum):
     kek_datum.plugin_meta = kek_meta_dto.plugin_meta
 
 
+@six.add_metaclass(abc.ABCMeta)
 class CryptoPluginBase(object):
     """Base class for Crypto plugins."""
 
-    __metaclass__ = abc.ABCMeta
-
     @abc.abstractmethod
     def encrypt(self, encrypt_dto, kek_meta_dto, keystone_id):
         """Encrypt unencrypted data in the context of the provided tenant.
diff --git a/barbican/tasks/resources.py b/barbican/tasks/resources.py
index 70998e787..4325ef92f 100644
--- a/barbican/tasks/resources.py
+++ b/barbican/tasks/resources.py
@@ -18,6 +18,8 @@ Task resources for the Barbican API.
 """
 import abc
 
+import six
+
 from barbican import api
 from barbican.common import resources as res
 from barbican.common import utils
@@ -29,11 +31,10 @@ from barbican.openstack.common import gettextutils as u
 LOG = utils.getLogger(__name__)
 
 
+@six.add_metaclass(abc.ABCMeta)
 class BaseTask(object):
     """Base asychronous task."""
 
-    __metaclass__ = abc.ABCMeta
-
     @abc.abstractmethod
     def get_name(self):
         """A hook method to return a short localized name for this task.