Merge "Remove six murano/db"

murano/db/migration/helpers.py

@@ -13,13 +13,12 @@
 #    under the License.
 
 from alembic import op
-import six
 import sqlalchemy as sa
 
 
 def transform_table(name, renames, defaults, *columns, **kw):
     def escape(val):
-        if isinstance(val, six.string_types):
+        if isinstance(val, str):
             return "'{0}'".format(val)
         elif val is None:
             return 'NULL'

murano/db/services/environments.py

@@ -16,7 +16,6 @@
 from keystoneclient import exceptions as ks_exceptions
 from oslo_config import cfg
 from oslo_log import log as logging
-import six
 import yaml
 
 from murano.common import auth_utils
@@ -261,7 +260,7 @@ class EnvironmentServices(object):
         elif isinstance(data, list):
             return [EnvironmentServices._objectify(v, replacements)
                     for v in data]
-        elif isinstance(data, six.string_types):
+        elif isinstance(data, str):
             for key, value in replacements.items():
                 data = data.replace('%' + key + '%', value)
         return data

murano/tests/unit/db/test_catalog.py

@@ -14,7 +14,6 @@
 import uuid
 
 from oslo_db import exception as db_exception
-from six.moves import range
 from webob import exc
 
 from murano.db.catalog import api