Merge "Remove six murano/db"
This commit is contained in:
commit
8308ef1b5c
|
@ -13,13 +13,12 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from alembic import op
|
from alembic import op
|
||||||
import six
|
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
def transform_table(name, renames, defaults, *columns, **kw):
|
def transform_table(name, renames, defaults, *columns, **kw):
|
||||||
def escape(val):
|
def escape(val):
|
||||||
if isinstance(val, six.string_types):
|
if isinstance(val, str):
|
||||||
return "'{0}'".format(val)
|
return "'{0}'".format(val)
|
||||||
elif val is None:
|
elif val is None:
|
||||||
return 'NULL'
|
return 'NULL'
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
from keystoneclient import exceptions as ks_exceptions
|
from keystoneclient import exceptions as ks_exceptions
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
import six
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from murano.common import auth_utils
|
from murano.common import auth_utils
|
||||||
|
@ -261,7 +260,7 @@ class EnvironmentServices(object):
|
||||||
elif isinstance(data, list):
|
elif isinstance(data, list):
|
||||||
return [EnvironmentServices._objectify(v, replacements)
|
return [EnvironmentServices._objectify(v, replacements)
|
||||||
for v in data]
|
for v in data]
|
||||||
elif isinstance(data, six.string_types):
|
elif isinstance(data, str):
|
||||||
for key, value in replacements.items():
|
for key, value in replacements.items():
|
||||||
data = data.replace('%' + key + '%', value)
|
data = data.replace('%' + key + '%', value)
|
||||||
return data
|
return data
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from oslo_db import exception as db_exception
|
from oslo_db import exception as db_exception
|
||||||
from six.moves import range
|
|
||||||
from webob import exc
|
from webob import exc
|
||||||
|
|
||||||
from murano.db.catalog import api
|
from murano.db.catalog import api
|
||||||
|
|
Loading…
Reference in New Issue