Migrate to oslo.i18n

Mostly trivial import changes.

- oslo.i18n no longer provide install() method to inject _() into
  globals(), so removed all calls to it;
- removed Babel from dependencies (it will now be grabbed by oslo.i18n);
- updated tox.ini to ignore import violations for oslo.i18n.

Change-Id: I6623d551f512fb7fe9bf35ee734ed6d4c6cbc287

neutron/services/loadbalancer/agent/agent_manager.py

@@ -21,7 +21,7 @@ from neutron.common import exceptions as n_exc
 from neutron.common import rpc as n_rpc
 from neutron.common import topics
 from neutron import context
-from neutron.openstack.common.gettextutils import _LE, _LI
+from neutron.i18n import _LE, _LI
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import loopingcall
 from neutron.openstack.common import periodic_task

neutron/services/loadbalancer/agent_scheduler.py

@@ -24,7 +24,7 @@ from neutron.db import agents_db
 from neutron.db import agentschedulers_db
 from neutron.db import model_base
 from neutron.extensions import lbaas_agentscheduler
-from neutron.openstack.common.gettextutils import _LW
+from neutron.i18n import _LW
 from neutron.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

neutron/services/loadbalancer/drivers/common/agent_driver_base.py

@@ -26,7 +26,7 @@ from neutron.db import agents_db
 from neutron.db.loadbalancer import loadbalancer_db
 from neutron.extensions import lbaas_agentscheduler
 from neutron.extensions import portbindings
-from neutron.openstack.common.gettextutils import _LW
+from neutron.i18n import _LW
 from neutron.openstack.common import log as logging
 from neutron.plugins.common import constants
 from neutron.services.loadbalancer.drivers import abstract_driver

neutron/services/loadbalancer/drivers/embrane/agent/dispatcher.py

@@ -17,7 +17,7 @@ from eventlet import greenthread
 from eventlet import queue
 from heleosapi import exceptions as h_exc
 
-from neutron.openstack.common.gettextutils import _LE
+from neutron.i18n import _LE
 from neutron.openstack.common import log as logging
 from neutron.plugins.embrane.common import contexts as ctx
 from neutron.services.loadbalancer.drivers.embrane.agent import lb_operations

neutron/services/loadbalancer/drivers/embrane/agent/lb_operations.py

@@ -17,7 +17,7 @@ import functools
 
 from heleosapi import exceptions as h_exc
 
-from neutron.openstack.common.gettextutils import _LW
+from neutron.i18n import _LW
 from neutron.openstack.common import log as logging
 from neutron.services.loadbalancer import constants as lcon
 from neutron.services.loadbalancer.drivers.embrane import constants as econ

neutron/services/loadbalancer/drivers/embrane/driver.py

@@ -22,7 +22,7 @@ from neutron.api.v2 import attributes
 from neutron.common import exceptions as n_exc
 from neutron.db.loadbalancer import loadbalancer_db as ldb
 from neutron.extensions import loadbalancer as lb_ext
-from neutron.openstack.common.gettextutils import _LW
+from neutron.i18n import _LW
 from neutron.openstack.common import log as logging
 from neutron.plugins.common import constants as pcon
 from neutron.plugins.embrane.common import contexts as embrane_ctx

neutron/services/loadbalancer/drivers/embrane/poller.py

@@ -18,7 +18,7 @@ from heleosapi import exceptions as h_exc
 from neutron import context
 from neutron.db.loadbalancer import loadbalancer_db as ldb
 from neutron.db import servicetype_db as sdb
-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 loopingcall
 from neutron.plugins.common import constants as ccon

neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py

@@ -26,7 +26,7 @@ from neutron.agent.linux import ip_lib
 from neutron.agent.linux import utils
 from neutron.common import exceptions
 from neutron.common import utils as n_utils
-from neutron.openstack.common.gettextutils import _LE, _LW
+from neutron.i18n import _LE, _LW
 from neutron.openstack.common import log as logging
 from neutron.plugins.common import constants
 from neutron.services.loadbalancer.agent import agent_device_driver

neutron/services/loadbalancer/drivers/netscaler/ncc_client.py

@@ -18,7 +18,7 @@ from oslo.serialization import jsonutils
 import requests
 
 from neutron.common import exceptions as n_exc
-from neutron.openstack.common.gettextutils import _LE
+from neutron.i18n import _LE
 from neutron.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

neutron/services/loadbalancer/drivers/netscaler/netscaler_driver.py

@@ -16,7 +16,7 @@ from oslo.config import cfg
 
 from neutron.api.v2 import attributes
 from neutron.db.loadbalancer import loadbalancer_db
-from neutron.openstack.common.gettextutils import _LI
+from neutron.i18n import _LI
 from neutron.openstack.common import log as logging
 from neutron.plugins.common import constants
 from neutron.services.loadbalancer.drivers import abstract_driver

neutron/services/loadbalancer/drivers/radware/driver.py

@@ -33,7 +33,7 @@ from neutron.common import log as call_log
 from neutron import context
 from neutron.db.loadbalancer import loadbalancer_db as lb_db
 from neutron.extensions import loadbalancer
-from neutron.openstack.common.gettextutils import _LE, _LI, _LW
+from neutron.i18n import _LE, _LI, _LW
 from neutron.openstack.common import log as logging
 from neutron.plugins.common import constants
 from neutron.services.loadbalancer.drivers import abstract_driver

neutron/services/loadbalancer/plugin.py

@@ -21,7 +21,7 @@ from neutron import context
 from neutron.db.loadbalancer import loadbalancer_db as ldb
 from neutron.db import servicetype_db as st_db
 from neutron.extensions import loadbalancer
-from neutron.openstack.common.gettextutils import _LE
+from neutron.i18n import _LE
 from neutron.openstack.common import log as logging
 from neutron.plugins.common import constants
 from neutron.services.loadbalancer import agent_scheduler

openstack-common.conf

@@ -5,7 +5,6 @@ module=context
 module=eventlet_backdoor
 module=fileutils
 module=fixture
-module=gettextutils
 module=install_venv_common
 module=local
 module=lockutils

requirements.txt

@@ -8,7 +8,6 @@ PasteDeploy>=1.5.0
 Routes>=1.12.3,!=2.0
 anyjson>=0.3.3
 argparse
-Babel>=1.3
 eventlet>=0.15.2
 greenlet>=0.3.2
 httplib2>=0.7.5

tox.ini

@@ -88,5 +88,5 @@ commands =
   pylint --rcfile=.pylintrc --output-format=colorized {posargs:neutron}
 
 [hacking]
-import_exceptions = neutron.openstack.common.gettextutils
+import_exceptions = neutron.i18n
 local-check-factory = neutron.hacking.checks.factory