diff --git a/cmd/xjob.py b/cmd/xjob.py index fdc2754b..e9e109b0 100644 --- a/cmd/xjob.py +++ b/cmd/xjob.py @@ -28,8 +28,7 @@ from oslo_config import cfg from oslo_log import log as logging from tricircle.common import config -from tricircle.common.i18n import _LI -from tricircle.common.i18n import _LW +from tricircle.common.i18n import _LI, _LW from tricircle.xjob import xservice diff --git a/tox.ini b/tox.ini index 60a5370e..ddfc2db9 100644 --- a/tox.ini +++ b/tox.ini @@ -46,3 +46,6 @@ commands = oslo_debug_helper {posargs} show-source = True builtins = _ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build + +[hacking] +import_exceptions = tricircle.common.i18n diff --git a/tricircle/network/central_plugin.py b/tricircle/network/central_plugin.py index 7ae65a93..a466b50e 100644 --- a/tricircle/network/central_plugin.py +++ b/tricircle/network/central_plugin.py @@ -47,10 +47,7 @@ import tricircle.common.client as t_client import tricircle.common.constants as t_constants import tricircle.common.context as t_context import tricircle.common.exceptions as t_exceptions -from tricircle.common.i18n import _ -from tricircle.common.i18n import _LE -from tricircle.common.i18n import _LI -from tricircle.common.i18n import _LW +from tricircle.common.i18n import _, _LE, _LI, _LW from tricircle.common import xrpcapi import tricircle.db.api as db_api from tricircle.db import core diff --git a/tricircle/network/drivers/type_shared_vlan.py b/tricircle/network/drivers/type_shared_vlan.py index 12761f78..ce65667f 100644 --- a/tricircle/network/drivers/type_shared_vlan.py +++ b/tricircle/network/drivers/type_shared_vlan.py @@ -23,8 +23,7 @@ from neutron.plugins.ml2 import driver_api from neutron.plugins.ml2.drivers import type_vlan from tricircle.common import constants -from tricircle.common.i18n import _LE -from tricircle.common.i18n import _LI +from tricircle.common.i18n import _LE, _LI LOG = log.getLogger(__name__) diff --git a/tricircle/xjob/xmanager.py b/tricircle/xjob/xmanager.py index f1bf3434..b6a14a05 100644 --- a/tricircle/xjob/xmanager.py +++ b/tricircle/xjob/xmanager.py @@ -29,10 +29,7 @@ import neutronclient.common.exceptions as q_cli_exceptions from tricircle.common import client from tricircle.common import constants -from tricircle.common.i18n import _ -from tricircle.common.i18n import _LE -from tricircle.common.i18n import _LI -from tricircle.common.i18n import _LW +from tricircle.common.i18n import _, _LE, _LI, _LW from tricircle.common import xrpcapi import tricircle.db.api as db_api from tricircle.db import core diff --git a/tricircle/xjob/xservice.py b/tricircle/xjob/xservice.py index 39f15167..18dc8d94 100644 --- a/tricircle/xjob/xservice.py +++ b/tricircle/xjob/xservice.py @@ -24,9 +24,7 @@ from oslo_log import log as logging import oslo_messaging as messaging from oslo_service import service as srv -from tricircle.common.i18n import _ -from tricircle.common.i18n import _LE -from tricircle.common.i18n import _LI +from tricircle.common.i18n import _, _LE, _LI from tricircle.common import baserpc from tricircle.common import context