Merge "Migrate to oslo.i18n"

neutron/db/vpn/vpn_db.py

@@ -27,8 +27,8 @@ from neutron.db import model_base
 from neutron.db import models_v2
 from neutron.db.vpn import vpn_validator
 from neutron.extensions import vpnaas
+from neutron.i18n import _LW
 from neutron import manager
-from neutron.openstack.common.gettextutils import _LW
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import uuidutils
 from neutron.plugins.common import constants

neutron/services/vpn/device_drivers/cisco_csr_rest_client.py

@@ -19,7 +19,7 @@ from oslo.serialization import jsonutils
 import requests
 from requests import exceptions as r_exc
 
-from neutron.openstack.common.gettextutils import _LE, _LW
+from neutron.i18n import _LE, _LW
 from neutron.openstack.common import log as logging
 
 

neutron/services/vpn/device_drivers/cisco_ipsec.py

@@ -23,7 +23,7 @@ import six
 from neutron.common import exceptions
 from neutron.common import rpc as n_rpc
 from neutron import context as ctx
-from neutron.openstack.common.gettextutils import _LE, _LI, _LW
+from neutron.i18n import _LE, _LI, _LW
 from neutron.openstack.common import lockutils
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import loopingcall

neutron/services/vpn/device_drivers/ipsec.py

@@ -28,7 +28,7 @@ from neutron.agent.linux import ip_lib
 from neutron.agent.linux import utils
 from neutron.common import rpc as n_rpc
 from neutron import context
-from neutron.openstack.common.gettextutils import _LE
+from neutron.i18n import _LE
 from neutron.openstack.common import lockutils
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import loopingcall

neutron/services/vpn/plugin.py

@@ -15,7 +15,7 @@
 #    under the License.
 
 from neutron.db.vpn import vpn_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 import service_base

neutron/services/vpn/service_drivers/cisco_csr_db.py

@@ -20,7 +20,7 @@ from neutron.common import exceptions
 from neutron.db import model_base
 from neutron.db import models_v2
 from neutron.db.vpn import vpn_db
-from neutron.openstack.common.gettextutils import _LI
+from neutron.i18n import _LI
 from neutron.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

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