Merge "Migrate to oslo.i18n"
This commit is contained in:
commit
abce1d4f8e
|
@ -21,7 +21,7 @@ from neutron.agent.linux import ip_lib
|
||||||
from neutron.common import topics
|
from neutron.common import topics
|
||||||
from neutron import context
|
from neutron import context
|
||||||
from neutron.extensions import firewall as fw_ext
|
from neutron.extensions import firewall as fw_ext
|
||||||
from neutron.openstack.common.gettextutils import _LE
|
from neutron.i18n import _LE
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron.plugins.common import constants
|
from neutron.plugins.common import constants
|
||||||
from neutron.services.firewall.agents import firewall_agent_api as api
|
from neutron.services.firewall.agents import firewall_agent_api as api
|
||||||
|
|
|
@ -19,7 +19,7 @@ import httplib2
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
from oslo.serialization import jsonutils
|
from oslo.serialization import jsonutils
|
||||||
|
|
||||||
from neutron.openstack.common.gettextutils import _LE
|
from neutron.i18n import _LE
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron.services.firewall.agents.varmour import varmour_utils as va_utils
|
from neutron.services.firewall.agents.varmour import varmour_utils as va_utils
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ from neutron.agent.linux import ip_lib
|
||||||
from neutron.common import config as common_config
|
from neutron.common import config as common_config
|
||||||
from neutron.common import constants as l3_constants
|
from neutron.common import constants as l3_constants
|
||||||
from neutron.common import topics
|
from neutron.common import topics
|
||||||
from neutron.openstack.common.gettextutils import _LW
|
from neutron.i18n import _LW
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron.openstack.common import service
|
from neutron.openstack.common import service
|
||||||
from neutron import service as neutron_service
|
from neutron import service as neutron_service
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
from neutron.agent.linux import iptables_manager
|
from neutron.agent.linux import iptables_manager
|
||||||
from neutron.extensions import firewall as fw_ext
|
from neutron.extensions import firewall as fw_ext
|
||||||
from neutron.openstack.common.gettextutils import _LE
|
from neutron.i18n import _LE
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron.services.firewall.drivers import fwaas_base
|
from neutron.services.firewall.drivers import fwaas_base
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from neutron.openstack.common.gettextutils import _LW
|
from neutron.i18n import _LW
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron.services.firewall.agents.varmour import varmour_api
|
from neutron.services.firewall.agents.varmour import varmour_api
|
||||||
from neutron.services.firewall.agents.varmour import varmour_utils as va_utils
|
from neutron.services.firewall.agents.varmour import varmour_utils as va_utils
|
||||||
|
|
|
@ -22,7 +22,7 @@ from neutron.common import topics
|
||||||
from neutron import context as neutron_context
|
from neutron import context as neutron_context
|
||||||
from neutron.db.firewall import firewall_db
|
from neutron.db.firewall import firewall_db
|
||||||
from neutron.extensions import firewall as fw_ext
|
from neutron.extensions import firewall as fw_ext
|
||||||
from neutron.openstack.common.gettextutils import _LW
|
from neutron.i18n import _LW
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron.plugins.common import constants as const
|
from neutron.plugins.common import constants as const
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@ module=context
|
||||||
module=eventlet_backdoor
|
module=eventlet_backdoor
|
||||||
module=fileutils
|
module=fileutils
|
||||||
module=fixture
|
module=fixture
|
||||||
module=gettextutils
|
|
||||||
module=install_venv_common
|
module=install_venv_common
|
||||||
module=local
|
module=local
|
||||||
module=lockutils
|
module=lockutils
|
||||||
|
|
|
@ -8,7 +8,6 @@ PasteDeploy>=1.5.0
|
||||||
Routes>=1.12.3,!=2.0
|
Routes>=1.12.3,!=2.0
|
||||||
anyjson>=0.3.3
|
anyjson>=0.3.3
|
||||||
argparse
|
argparse
|
||||||
Babel>=1.3
|
|
||||||
eventlet>=0.15.2
|
eventlet>=0.15.2
|
||||||
greenlet>=0.3.2
|
greenlet>=0.3.2
|
||||||
httplib2>=0.7.5
|
httplib2>=0.7.5
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -88,5 +88,5 @@ commands =
|
||||||
pylint --rcfile=.pylintrc --output-format=colorized {posargs:neutron}
|
pylint --rcfile=.pylintrc --output-format=colorized {posargs:neutron}
|
||||||
|
|
||||||
[hacking]
|
[hacking]
|
||||||
import_exceptions = neutron.openstack.common.gettextutils
|
import_exceptions = neutron.i18n
|
||||||
local-check-factory = neutron.hacking.checks.factory
|
local-check-factory = neutron.hacking.checks.factory
|
||||||
|
|
Loading…
Reference in New Issue