Remove six usage and basestring check

Remove basestring check.
Remove six Replace the following items with Python 3 style code.

- six.string_types
- six.int2byte
- six.indexbytes
- six.add_metaclass
- six.StringIO
- six.text_type
- six.integer_types
- six.binary_type
- six.BytesIO
- six.reraise

Change-Id: I4fb9033d152963c504ceb4d5c4d08f934ee4accb

7 files changed, 7 insertions, 20 deletions

diff --git a/trove/guestagent/common/configuration.py b/trove/guestagent/common/configuration.py
index 58595eb1..9ea7d4e1 100644
--- a/trove/guestagent/common/configuration.py
+++ b/trove/guestagent/common/configuration.py
@@ -18,7 +18,6 @@ import os
 import re
 
 from oslo_log import log as logging
-import six
 
 from trove.guestagent.common import guestagent_utils
 from trove.guestagent.common import operating_system
@@ -224,8 +223,7 @@ class ConfigurationManager(object):
         self._value_cache = self.parse_configuration()
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ConfigurationOverrideStrategy(object):
+class ConfigurationOverrideStrategy(object, metaclass=abc.ABCMeta):
     """ConfigurationOverrideStrategy handles configuration files.
     The strategy provides functionality to enumerate, apply and remove
     configuration overrides.
diff --git a/trove/guestagent/common/guestagent_utils.py b/trove/guestagent/common/guestagent_utils.py
index bd0a631b..23d009bb 100644
--- a/trove/guestagent/common/guestagent_utils.py
+++ b/trove/guestagent/common/guestagent_utils.py
@@ -17,8 +17,6 @@ import collections
 import os
 import re
 
-import six
-
 from trove.common import cfg
 from trove.common import pagination
 from trove.common import utils
@@ -112,7 +110,7 @@ def build_file_path(base_dir, base_name, *extensions):
 def to_bytes(value):
     """Convert numbers with a byte suffix to bytes.
     """
-    if isinstance(value, six.string_types):
+    if isinstance(value, str):
         pattern = re.compile(r'^(\d+)([K,M,G]{1})$')
         match = pattern.match(value)
         if match:
diff --git a/trove/guestagent/datastore/mysql_common/service.py b/trove/guestagent/datastore/mysql_common/service.py
index 9f6e5d93..6e29ec7b 100644
--- a/trove/guestagent/datastore/mysql_common/service.py
+++ b/trove/guestagent/datastore/mysql_common/service.py
@@ -17,7 +17,6 @@ import re
 
 from oslo_log import log as logging
 from oslo_utils import encodeutils
-import six
 import sqlalchemy
 from sqlalchemy import exc
 from sqlalchemy.sql.expression import text
@@ -93,8 +92,7 @@ class BaseMySqlAppStatus(service.BaseDbStatus):
             return service_status.ServiceStatuses.UNKNOWN
 
 
-@six.add_metaclass(abc.ABCMeta)
-class BaseMySqlAdmin(object):
+class BaseMySqlAdmin(object, metaclass=abc.ABCMeta):
     """Handles administrative tasks on the MySQL database."""
 
     def __init__(self, mysql_root_access, mysql_app):
diff --git a/trove/guestagent/module/drivers/module_driver.py b/trove/guestagent/module/drivers/module_driver.py
index ede44661..95a1fe1b 100644
--- a/trove/guestagent/module/drivers/module_driver.py
+++ b/trove/guestagent/module/drivers/module_driver.py
@@ -17,7 +17,6 @@
 import abc
 import functools
 import re
-import six
 
 from oslo_log import log as logging
 
@@ -27,8 +26,7 @@ from trove.common import exception
 LOG = logging.getLogger(__name__)
 
 
-@six.add_metaclass(abc.ABCMeta)
-class ModuleDriver(object):
+class ModuleDriver(object, metaclass=abc.ABCMeta):
     """Base class that defines the contract for module drivers.
 
     Note that you don't have to derive from this class to have a valid
diff --git a/trove/guestagent/pkg.py b/trove/guestagent/pkg.py
index 5dc00903..c9d010f6 100644
--- a/trove/guestagent/pkg.py
+++ b/trove/guestagent/pkg.py
@@ -24,7 +24,6 @@ from tempfile import NamedTemporaryFile
 from oslo_log import log as logging
 from oslo_utils import encodeutils
 import pexpect
-import six
 
 from trove.common import exception
 from trove.common.exception import ProcessExecutionError
@@ -52,7 +51,7 @@ def getoutput(*cmd):
                                 stderr=subprocess.STDOUT)
     except OSError:
         # ignore errors like program not found
-        return six.text_type("")
+        return str("")
 
     stdout = proc.communicate()[0]
     return encodeutils.safe_decode(stdout)
diff --git a/trove/guestagent/strategies/replication/base.py b/trove/guestagent/strategies/replication/base.py
index 6e655925..5b7cbbae 100644
--- a/trove/guestagent/strategies/replication/base.py
+++ b/trove/guestagent/strategies/replication/base.py
@@ -16,12 +16,10 @@
 
 import abc
 
-import six
 from trove.common.strategies.strategy import Strategy
 
 
-@six.add_metaclass(abc.ABCMeta)
-class Replication(Strategy):
+class Replication(Strategy, metaclass=abc.ABCMeta):
     """Base class for Replication Strategy implementation."""
 
     __strategy_type__ = 'replication'
diff --git a/trove/guestagent/volume.py b/trove/guestagent/volume.py
index eea86bc8..e0fd04fd 100644
--- a/trove/guestagent/volume.py
+++ b/trove/guestagent/volume.py
@@ -16,7 +16,6 @@
 import abc
 import os
 import shlex
-import six
 from tempfile import NamedTemporaryFile
 import traceback
 
@@ -51,8 +50,7 @@ def log_and_raise(log_fmt, exc_fmt, fmt_content=None):
     raise exception.GuestError(original_message=raise_msg)
 
 
-@six.add_metaclass(abc.ABCMeta)
-class FSBase(object):
+class FSBase(object, metaclass=abc.ABCMeta):
 
     def __init__(self, fstype, format_options):
         self.fstype = fstype