Remove six usage

six library helped a lot for Py2/Py3 compatibility. Thanks the authors
for the great library.

Since we do not support Python 2, there is no need in six anymore

Change-Id: If5213c088964aa137e6ff5ac2c376a02a980aa72

rally/api.py

@@ -252,7 +252,7 @@ def is_really_missing(mis, task_template):
         #                 builtin functions (e.g. range()). Unfortunately,
         #                 __builtins__ doesn't return them (when it is not
         #                 main module)
-        from six.moves import builtins
+        import builtins
 
         env = jinja2.Environment(
             loader=jinja2.FileSystemLoader(template_dir, encoding="utf8"))

rally/cli/cliutils.py

@@ -25,7 +25,6 @@
 
 import jsonschema
 import prettytable
-import six
 import sqlalchemy.exc
 
 from rally import api
@@ -211,10 +210,10 @@ def print_dict(obj, fields=None, formatters=None, mixed_case_fields=False,
         if isinstance(data, (dict, list)):
             data = json.dumps(data)
         if wrap > 0:
-            data = textwrap.fill(six.text_type(data), wrap)
+            data = textwrap.fill(str(data), wrap)
         # if value has a newline, add in multiple rows
         # e.g. fault with stacktrace
-        if (data and isinstance(data, six.string_types)
+        if (data and isinstance(data, str)
                 and (r"\n" in data or "\r" in data)):
             # "\r" would break the table, so remove it.
             if "\r" in data:
@@ -623,7 +622,7 @@ def run(argv, categories):
         v = getattr(CONF.category, "action_kwarg_" + k)
         if v is None:
             continue
-        if isinstance(v, six.string_types):
+        if isinstance(v, str):
             v = encodeutils.safe_decode(v)
         fn_kwargs[k] = v
 

rally/cli/commands/task.py

@@ -25,7 +25,6 @@
 import webbrowser
 
 import jsonschema
-import six
 
 from rally.cli import cliutils
 from rally.cli import envutils
@@ -179,7 +178,7 @@ def _load_and_validate_task(self, api, task_file, args_file=None,
         if raw_args:
             try:
                 data = yaml.safe_load(raw_args)
-                if isinstance(data, (six.text_type, six.string_types)):
+                if isinstance(data, str):
                     raise yaml.ParserError("String '%s' doesn't look like a "
                                            "dictionary." % raw_args)
                 task_args.update(data)
@@ -709,7 +708,7 @@ def _load_task_results_file(self, api, task_id):
                         result, OLD_TASK_RESULT_SCHEMA)
                 except jsonschema.ValidationError as e:
                     raise FailedToLoadResults(source=task_id,
-                                              msg=six.text_type(e))
+                                              msg=str(e))
 
                 iter_count = 0
                 failed_iter_count = 0
@@ -795,7 +794,7 @@ def _load_task_results_file(self, api, task_id):
                     jsonschema.validate(task_result,
                                         api.task.TASK_SCHEMA)
                 except jsonschema.ValidationError as e:
-                    msg = six.text_type(e)
+                    msg = str(e)
                     raise exceptions.RallyException(
                         "ERROR: Invalid task result format\n\n\t%s" % msg)
                 task_result.setdefault("env_name", "n/a")

rally/cli/commands/verify.py

@@ -17,13 +17,12 @@
 
 from __future__ import print_function
 
+import configparser
 import datetime as dt
 import json
 import os
 import webbrowser
 
-from six.moves import configparser
-
 from rally.cli import cliutils
 from rally.cli import envutils
 from rally.common import fileutils

rally/common/db/api.py

@@ -42,7 +42,6 @@
 
 import datetime as dt
 import functools
-import six
 import tempfile
 import time
 
@@ -101,9 +100,8 @@ def engine_reset():
 def serialize(data):
     if data is None:
         return None
-    if isinstance(data, (six.integer_types,
-                         six.string_types,
-                         six.text_type,
+    if isinstance(data, (int,
+                         str,
                          dt.date,
                          dt.time,
                          float,

rally/common/db/models.py

@@ -18,7 +18,6 @@
 import datetime as dt
 import uuid
 
-import six
 import sqlalchemy as sa
 import sqlalchemy.ext.declarative
 import sqlalchemy.orm   # noqa (used as sa.orm)
@@ -34,7 +33,7 @@ def UUID():
     return str(uuid.uuid4())
 
 
-class RallyBase(six.Iterator):
+class RallyBase(object):
     """Base class for models."""
     __table_initialized__ = False
     metadata = None

rally/common/logging.py

@@ -18,7 +18,6 @@
 
 from oslo_log import handlers
 from oslo_log import log as oslogging
-import six
 
 from rally.common import cfg
 
@@ -107,7 +106,7 @@ def error(self, msg, *args, **kwargs):
         self.log(log.ERROR, msg, *args, **kwargs)
 
     def exception(self, msg, exc_info=True, *args, **kwargs):
-        if not isinstance(msg, (six.text_type, six.string_types)):
+        if not isinstance(msg, str):
             caller = self._find_the_caller()
             logger = getLogger("%s:%s" % (caller[0], caller[1]))
             logger.warning("[%s] %s" % (caller[2], self._exc_msg))

rally/common/objects/task.py

@@ -16,7 +16,6 @@
 import collections
 import copy
 import datetime as dt
-import six
 import uuid
 
 from rally.common import db
@@ -451,7 +450,7 @@ def result_has_valid_schema(self, result):
                 actions_list.extend(action["children"])
 
         for e in result["error"]:
-            if not isinstance(e, (six.string_types, six.text_type)):
+            if not isinstance(e, str):
                 LOG.warning("error value has wrong type '%s', should be 'str'"
                             % type(e))
                 return False

rally/common/plugin/discover.py

@@ -19,8 +19,6 @@
 import pkgutil
 import sys
 
-import six
-
 import rally
 from rally.common import logging
 
@@ -121,7 +119,7 @@ def import_modules_by_entry_point(_packages=None):
                 if logging.is_debug():
                     LOG.exception(msg)
                 else:
-                    LOG.warning(msg + (": %s" % six.text_type(e)))
+                    LOG.warning(msg + (": %s" % str(e)))
     return loaded_packages
 
 

rally/common/plugin/plugin.py

@@ -33,9 +33,6 @@ def base():
     - Plugin lookup - one can easily get all plugins from some base.
 
     Plugin bases by default initialize _default_meta
-
-    .. warning:: This decorator should be added the line before
-        six.add_metaclass if it is used.
     """
     def wrapper(cls):
         if not issubclass(cls, Plugin):

rally/common/sshutils.py

@@ -57,13 +57,14 @@ def write(chunk):
 
 """
 
+import io
 import os
 import select
+import shlex
 import socket
 import time
 
 import paramiko
-import six
 
 from rally.common import logging
 from rally import exceptions
@@ -95,8 +96,8 @@ def __init__(self, user, host, port=22, pkey=None,
         self._client = False
 
     def _get_pkey(self, key):
-        if isinstance(key, six.string_types):
-            key = six.moves.StringIO(key)
+        if isinstance(key, str):
+            key = io.StringIO(key)
         errors = []
         key_pos = key.seek(0, 1)
         for key_class in (paramiko.rsakey.RSAKey, paramiko.dsskey.DSSKey):
@@ -149,8 +150,8 @@ def run(self, cmd, stdin=None, stdout=None, stderr=None,
 
         client = self._get_client()
 
-        if isinstance(stdin, six.string_types):
-            stdin = six.moves.StringIO(stdin)
+        if isinstance(stdin, str):
+            stdin = io.StringIO(stdin)
 
         return self._run(client, cmd, stdin=stdin, stdout=stdout,
                          stderr=stderr, raise_on_error=raise_on_error,
@@ -160,7 +161,7 @@ def _run(self, client, cmd, stdin=None, stdout=None, stderr=None,
              raise_on_error=True, timeout=3600):
 
         if isinstance(cmd, (list, tuple)):
-            cmd = " ".join(six.moves.shlex_quote(str(p)) for p in cmd)
+            cmd = " ".join(shlex.quote(str(p)) for p in cmd)
 
         transport = client.get_transport()
         session = transport.open_session()
@@ -238,8 +239,8 @@ def execute(self, cmd, stdin=None, timeout=3600):
 
         :returns: tuple (exit_status, stdout, stderr)
         """
-        stdout = six.moves.StringIO()
-        stderr = six.moves.StringIO()
+        stdout = io.StringIO()
+        stderr = io.StringIO()
 
         exit_status, data = self.run(cmd, stderr=stderr, stdout=stdout,
                                      stdin=stdin, timeout=timeout,

rally/common/streaming_algorithms.py

@@ -21,13 +21,10 @@
 import math
 import os
 
-import six
-
 from rally.common import utils as cutils
 
 
-@six.add_metaclass(abc.ABCMeta)
-class StreamingAlgorithm(object):
+class StreamingAlgorithm(object, metaclass=abc.ABCMeta):
     """Base class for streaming computations that scale."""
 
     @abc.abstractmethod

rally/common/validation.py

@@ -16,8 +16,6 @@
 import abc
 import traceback
 
-import six
-
 from rally.common import logging
 from rally.common.plugin import plugin
 from rally import exceptions
@@ -38,8 +36,7 @@ def wrapper(cls):
 
 
 @plugin.base()
-@six.add_metaclass(abc.ABCMeta)
-class Validator(plugin.Plugin):
+class Validator(plugin.Plugin, metaclass=abc.ABCMeta):
     """A base class for all validators."""
 
     def __init__(self):

rally/exceptions.py

@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from rally.common.plugin import discover
 
 
@@ -41,7 +39,7 @@ def __init__(self, message=None, **kwargs):
         super(RallyException, self).__init__(self.msg_fmt % kwargs)
 
     def format_message(self):
-        return six.text_type(self)
+        return str(self)
 
 
 def find_exception(response):

rally/plugins/common/exporters/elastic/client.py

@@ -15,7 +15,6 @@
 import copy
 
 import requests
-import six
 
 from rally.common import logging
 from rally import exceptions
@@ -95,7 +94,7 @@ def push_documents(self, documents):
                   #     in `documents` (action and document itself).
                   (len(documents) / 2, self.CHUNK_LENGTH / 2))
 
-        for pos in six.moves.range(0, len(documents), self.CHUNK_LENGTH):
+        for pos in range(0, len(documents), self.CHUNK_LENGTH):
             data = "\n".join(documents[pos:pos + self.CHUNK_LENGTH]) + "\n"
 
             raw_resp = requests.post(

rally/plugins/common/exporters/elastic/flatten.py

@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 
 def _join_keys(first, second):
     if not second:
@@ -25,7 +23,7 @@ def _join_keys(first, second):
 
 
 def _process(obj):
-    if isinstance(obj, (six.string_types, six.binary_type)):
+    if isinstance(obj, (str, bytes)):
         yield "", obj
     elif isinstance(obj, dict):
         for first, tmp_value in obj.items():

rally/plugins/common/runners/constant.py

@@ -15,11 +15,10 @@
 
 import collections
 import multiprocessing
+import queue as Queue
 import threading
 import time
 
-from six.moves import queue as Queue
-
 from rally.common import utils
 from rally.common import validation
 from rally import consts

rally/plugins/common/runners/rps.py

@@ -15,10 +15,10 @@
 
 import collections
 import multiprocessing
+import queue as Queue
 import threading
 import time
 
-from six.moves import queue as Queue
 
 from rally.common import logging
 from rally.common import utils

rally/plugins/common/validators.py

@@ -16,7 +16,6 @@
 import os
 
 import jsonschema
-import six
 
 from rally.common import logging
 from rally.common import validation
@@ -193,7 +192,7 @@ def __init__(self, param_name, values, missed=False,
         if self.case_insensitive:
             self.values = []
             for value in values:
-                if isinstance(value, (six.text_type, six.string_types)):
+                if isinstance(value, str):
                     value = value.lower()
                 self.values.append(value)
         else:
@@ -203,7 +202,7 @@ def validate(self, context, config, plugin_cls, plugin_cfg):
         value = config.get("args", {}).get(self.param_name)
         if value:
             if self.case_insensitive:
-                if isinstance(value, (six.text_type, six.string_types)):
+                if isinstance(value, str):
                     value = value.lower()
 
             if value not in self.values: