diff --git a/murano/api/middleware/context.py b/murano/api/middleware/context.py index 583643f81..da9a0b035 100644 --- a/murano/api/middleware/context.py +++ b/murano/api/middleware/context.py @@ -16,7 +16,7 @@ from oslo.config import cfg from murano.common import wsgi import murano.context -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ import murano.openstack.common.log as logging context_opts = [ diff --git a/murano/api/middleware/version_negotiation.py b/murano/api/middleware/version_negotiation.py index bd5320485..004f7000b 100644 --- a/murano/api/middleware/version_negotiation.py +++ b/murano/api/middleware/version_negotiation.py @@ -22,7 +22,7 @@ from oslo.config import cfg from murano.api import versions from murano.common import wsgi -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ import murano.openstack.common.log as logging CONF = cfg.CONF diff --git a/murano/api/v1/actions.py b/murano/api/v1/actions.py index 73efd9c2b..a873b0964 100644 --- a/murano/api/v1/actions.py +++ b/murano/api/v1/actions.py @@ -20,7 +20,7 @@ from murano.db import models from murano.db.services import environments as envs from murano.db.services import sessions from murano.db import session as db_session -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging from murano.services import actions from murano.services import states diff --git a/murano/api/v1/catalog.py b/murano/api/v1/catalog.py index 747bf5e2c..cdad01d89 100644 --- a/murano/api/v1/catalog.py +++ b/murano/api/v1/catalog.py @@ -28,7 +28,7 @@ from murano.common import policy from murano.common import wsgi from murano.db.catalog import api as db_api from murano.openstack.common import exception -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging from murano.packages import exceptions as pkg_exc from murano.packages import load_utils diff --git a/murano/api/v1/deployments.py b/murano/api/v1/deployments.py index 2b4625128..ec1033ab5 100644 --- a/murano/api/v1/deployments.py +++ b/murano/api/v1/deployments.py @@ -22,7 +22,7 @@ from murano.common import wsgi from murano.db import models from murano.db import session as db_session -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/murano/api/v1/environments.py b/murano/api/v1/environments.py index e5da22910..7679fcb13 100644 --- a/murano/api/v1/environments.py +++ b/murano/api/v1/environments.py @@ -28,7 +28,7 @@ from murano.db.services import core_services from murano.db.services import environments as envs from murano.db import session as db_session -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/murano/api/v1/instance_statistics.py b/murano/api/v1/instance_statistics.py index c6ff9c78f..282c85c72 100644 --- a/murano/api/v1/instance_statistics.py +++ b/murano/api/v1/instance_statistics.py @@ -17,7 +17,6 @@ from murano.common import policy from murano.common import wsgi from murano.db.services import instances -from murano.openstack.common.gettextutils import _ # noqa from murano.openstack.common import log as logging diff --git a/murano/api/v1/sessions.py b/murano/api/v1/sessions.py index a6b1a115e..2b61053e9 100644 --- a/murano/api/v1/sessions.py +++ b/murano/api/v1/sessions.py @@ -20,7 +20,7 @@ from murano.db import models from murano.db.services import environments as envs from murano.db.services import sessions from murano.db import session as db_session -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging from murano.services import states diff --git a/murano/common/config.py b/murano/common/config.py index d01daa90c..b1a9a05f8 100644 --- a/murano/common/config.py +++ b/murano/common/config.py @@ -25,7 +25,7 @@ import sys from oslo.config import cfg from paste import deploy -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano import version paste_deploy_opts = [ diff --git a/murano/common/engine.py b/murano/common/engine.py index b6bd7b584..fc3d9cf79 100644 --- a/murano/common/engine.py +++ b/murano/common/engine.py @@ -31,7 +31,7 @@ from murano.engine import package_class_loader from murano.engine import package_loader from murano.engine.system import status_reporter import murano.engine.system.system_objects as system_objects -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging RPC_SERVICE = None diff --git a/murano/common/server.py b/murano/common/server.py index 66e3ac199..d473ffc58 100644 --- a/murano/common/server.py +++ b/murano/common/server.py @@ -26,7 +26,7 @@ from murano.db import models from murano.db.services import environments from murano.db.services import instances from murano.db import session -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging from murano.openstack.common import timeutils from murano.services import states diff --git a/murano/common/statservice.py b/murano/common/statservice.py index 8a0474c05..b526f0d9c 100644 --- a/murano/common/statservice.py +++ b/murano/common/statservice.py @@ -23,7 +23,7 @@ from murano.api.v1 import request_statistics from murano.common import config from murano.db.services import stats as db_stats -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging from murano.openstack.common import service diff --git a/murano/common/utils.py b/murano/common/utils.py index 67baeae9d..bd98867ef 100644 --- a/murano/common/utils.py +++ b/murano/common/utils.py @@ -19,7 +19,7 @@ import types import eventlet import jsonschema -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging diff --git a/murano/common/wsgi.py b/murano/common/wsgi.py index f6bfab5fc..1973f1fb3 100644 --- a/murano/common/wsgi.py +++ b/murano/common/wsgi.py @@ -37,7 +37,7 @@ from xml.parsers import expat from murano.api.v1 import schemas from murano.openstack.common import exception -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import jsonutils from murano.openstack.common import log as logging from murano.openstack.common import service diff --git a/murano/db/catalog/api.py b/murano/db/catalog/api.py index 3162d7f52..e2d826093 100644 --- a/murano/db/catalog/api.py +++ b/murano/db/catalog/api.py @@ -21,7 +21,7 @@ from webob import exc from murano.db import models from murano.db import session as db_session -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging CONF = cfg.CONF diff --git a/murano/utils.py b/murano/utils.py index 9d7f1da81..c23bb3135 100644 --- a/murano/utils.py +++ b/murano/utils.py @@ -19,7 +19,7 @@ from webob import exc from murano.db import models from murano.db.services import sessions from murano.db import session as db_session -from murano.openstack.common.gettextutils import _ # noqa +from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging from murano.services import states diff --git a/tox.ini b/tox.ini index e1225bfcb..cc9176591 100644 --- a/tox.ini +++ b/tox.ini @@ -45,3 +45,6 @@ ignore =H501,H702,H902 show-source = true builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools + +[hacking] +import_exceptions = murano.openstack.common.gettextutils