Merge "Apply six for metaclass"

trove/guestagent/pkg.py

@@ -21,6 +21,7 @@ import re
 from tempfile import NamedTemporaryFile
 
 import pexpect
+import six
 
 from trove.common import exception
 from trove.common import utils
@@ -405,6 +406,6 @@ class BasePackage(type):
         return super(BasePackage, meta).__new__(meta, name, bases, dct)
 
 
+@six.add_metaclass(BasePackage)
 class Package(object):
-
-    __metaclass__ = BasePackage
+    pass

trove/guestagent/strategy.py

@@ -15,6 +15,9 @@
 #
 
 import abc
+
+import six
+
 from trove.common import utils
 from trove.openstack.common import log as logging
 
@@ -22,8 +25,8 @@ from trove.openstack.common import log as logging
 LOG = logging.getLogger(__name__)
 
 
+@six.add_metaclass(abc.ABCMeta)
 class Strategy(object):
-    __metaclass__ = abc.ABCMeta
 
     __strategy_ns__ = None