Obsolete oslo-incubator modules - gettextutils (now oslo.i18n)

This change is part of a multi-part change set to handle obsolete and
graduated oslo modules. This commit handles the gettextutils module
which is now oslo.i18n. The change here is to remove it from
openstack-common.conf and point all people who used to use that at
oslo.i18n. requirements.txt has been updated to point to this
dependency.

We aren't deleting gettextutils.py from openstack/common because it is
used by other oslo-incubator modules.

This change has been rebased on https://review.openstack.org/#/c/129668/

Change-Id: I39fd288fb29a8317f896812a2f64bcd69a6b8e21
Partial-Bug: #1380789
blueprint: retire-unused-oslo-incubator-modules

openstack-common.conf

@@ -5,7 +5,6 @@ module=context
 module=eventlet_backdoor
 module=exception
 module=fileutils
-module=gettextutils
 module=local
 module=log
 module=loopingcall

requirements.txt

@@ -28,6 +28,7 @@ jsonschema>=2.0.0,<3.0.0
 Jinja2>=2.6  # BSD License (3 clause)
 pexpect>=3.1 # ISC License
 oslo.config>=1.4.0  # Apache-2.0
+oslo.i18n>=1.0.0
 oslo.serialization>=1.0.0
 oslo.utils>=1.1.0
 MySQL-python

trove/backup/models.py

@@ -27,7 +27,7 @@ from trove.taskmanager import api
 from trove.common.remote import create_swift_client
 from trove.common import utils
 from trove.quota.quota import run_with_quotas
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 CONF = cfg.CONF

trove/backup/service.py

@@ -20,7 +20,7 @@ from trove.common import cfg
 from trove.common import pagination
 from trove.common import wsgi
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/cluster/models.py

@@ -22,7 +22,7 @@ from trove.datastore import models as datastore_models
 from trove.db import models as dbmodels
 from trove.instance import models as inst_models
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.taskmanager import api as task_api
 
 

trove/cluster/service.py

@@ -26,7 +26,7 @@ from trove.common import utils
 from trove.common import wsgi
 from trove.datastore import models as datastore_models
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 CONF = cfg.CONF

trove/common/auth.py

@@ -19,7 +19,7 @@ import wsgi
 
 from trove.common import exception
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 

trove/common/exception.py

@@ -20,7 +20,7 @@ import re
 from trove.openstack.common import log as logging
 from trove.openstack.common import exception as openstack_exception
 from trove.openstack.common import processutils
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 ClientConnectionError = openstack_exception.ClientConnectionError

trove/common/extensions.py

@@ -27,7 +27,7 @@ from trove.openstack.common import log as logging
 from trove.openstack.common import exception
 from trove.common import cfg
 from trove.common import wsgi
-from trove.openstack.common.gettextutils import _  # noqa
+from trove.common.i18n import _  # noqa
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/common/i18n.py

@@ -0,0 +1,41 @@
+#    Copyright 2014 Tesora, Inc.
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""oslo.i18n integration module.
+
+See http://docs.openstack.org/developer/oslo.i18n/usage.html
+
+"""
+
+import oslo.i18n
+
+
+# NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
+# application name when this module is synced into the separate
+# repository. It is OK to have more than one translation function
+# using the same domain, since there will still only be one message
+# catalog.
+_translators = oslo.i18n.TranslatorFactory(domain='trove')
+
+# The primary translation function using the well-known name "_"
+_ = _translators.primary
+
+# Translators for log levels.
+#
+# The abbreviated names are meant to reflect the usual use of a short
+# name like '_'. The "L" is for "log" and the other letter comes from
+# the level.
+_LI = _translators.log_info
+_LW = _translators.log_warning
+_LE = _translators.log_error
+_LC = _translators.log_critical

trove/common/limits.py

@@ -32,7 +32,7 @@ from trove.common import cfg
 from trove.common import wsgi as base_wsgi
 from oslo.serialization import jsonutils
 from trove.openstack.common import wsgi
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 CONF = cfg.CONF

trove/common/strategies/mongodb/api.py

@@ -28,7 +28,7 @@ from trove.common import wsgi
 from trove.datastore import models as datastore_models
 from trove.extensions.mgmt.clusters.views import MgmtClusterView
 from trove.instance import models as inst_models
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.openstack.common import log as logging
 from trove.quota.quota import check_quotas
 from trove.taskmanager import api as task_api

trove/common/strategies/mongodb/taskmanager.py

@@ -25,7 +25,7 @@ from trove.instance.models import DBInstance
 from trove.instance.models import Instance
 from trove.instance.models import InstanceServiceStatus
 from trove.instance.tasks import InstanceTasks
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.openstack.common import log as logging
 from trove.taskmanager import api as task_api
 import trove.taskmanager.models as task_models

trove/common/template.py

@@ -22,7 +22,7 @@ from trove.common import configurations
 from trove.common import exception
 from trove.common import utils
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/common/utils.py

@@ -35,7 +35,7 @@ from trove.openstack.common import log as logging
 from trove.openstack.common import loopingcall
 from trove.openstack.common import processutils
 from trove.openstack.common import utils as openstack_utils
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/common/wsgi.py

@@ -29,7 +29,7 @@ import webob.exc
 from trove.common import context as rd_context
 from trove.common import exception
 from trove.common import utils
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from oslo.serialization import jsonutils
 
 from trove.openstack.common import pastedeploy

trove/conductor/manager.py

@@ -21,7 +21,7 @@ from trove.extensions.mysql import models as mysql_models
 from trove.instance import models as t_models
 from trove.openstack.common import log as logging
 from trove.openstack.common import periodic_task
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 RPC_API_VERSION = "1.0"

trove/configuration/models.py

@@ -24,7 +24,7 @@ from trove.datastore import models as dstore_models
 from trove.db import get_db_api
 from trove.db import models as dbmodels
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.taskmanager import api as task_api
 
 

trove/configuration/service.py

@@ -23,7 +23,7 @@ from trove.configuration import views
 from trove.configuration.models import DBConfigurationParameter
 from trove.datastore import models as ds_models
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.instance import models as instances_models
 import trove.common.apischema as apischema
 

trove/db/models.py

@@ -19,7 +19,7 @@ from trove.common import models
 from trove.common import pagination
 from trove.common import utils
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 

trove/db/sqlalchemy/session.py

@@ -20,7 +20,7 @@ from sqlalchemy.orm import sessionmaker
 
 from trove.common import cfg
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.db.sqlalchemy import mappers
 
 _ENGINE = None

trove/dns/models.py

@@ -22,7 +22,7 @@ from trove.db import get_db_api
 from trove.common import exception
 from trove.common.models import ModelBase
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/account/service.py

@@ -19,7 +19,7 @@ from trove.common import wsgi
 from trove.common.auth import admin_context
 from trove.extensions.account import models
 from trove.extensions.account import views
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 import trove.common.apischema as apischema
 
 LOG = logging.getLogger(__name__)

trove/extensions/mgmt/clusters/service.py

@@ -21,7 +21,7 @@ from trove.common.auth import admin_context
 from trove.extensions.mgmt.clusters import models
 from trove.extensions.mgmt.clusters import views
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 import trove.common.apischema as apischema
 
 LOG = logging.getLogger(__name__)

trove/extensions/mgmt/configuration/service.py

@@ -21,7 +21,7 @@ from trove.configuration import models as config_models
 from trove.datastore import models as ds_models
 from trove.extensions.mgmt.configuration import views
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 import trove.common.apischema as apischema
 
 

trove/extensions/mgmt/host/instance/service.py

@@ -18,7 +18,7 @@ from trove.common import exception
 from trove.common import wsgi
 from trove.extensions.mgmt.host import models
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/mgmt/host/models.py

@@ -18,7 +18,7 @@ Model classes that extend the instances functionality for MySQL instances.
 """
 
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 from trove.common import exception
 from trove.instance.models import DBInstance

trove/extensions/mgmt/host/service.py

@@ -20,7 +20,7 @@ from trove.extensions.mgmt.host import models
 from trove.extensions.mgmt.host import views
 from trove.instance.service import InstanceController
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/mgmt/instances/service.py

@@ -28,7 +28,7 @@ from trove.extensions.mgmt.instances.views import HwInfoView
 from trove.extensions.mysql import models as mysql_models
 from trove.instance.service import InstanceController
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 import trove.common.apischema as apischema
 
 

trove/extensions/mgmt/upgrade/service.py

@@ -17,7 +17,7 @@ from trove.common import wsgi
 from trove.common.auth import admin_context
 from trove.extensions.mgmt.upgrade.models import UpgradeMessageSender
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 import trove.common.apischema as apischema
 
 

trove/extensions/mgmt/volume/service.py

@@ -19,7 +19,7 @@ from trove.common.auth import admin_context
 from trove.extensions.mgmt.volume import models
 from trove.extensions.mgmt.volume import views
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/mysql/service.py

@@ -26,7 +26,7 @@ from trove.extensions.mysql import models
 from trove.extensions.mysql import views
 from trove.guestagent.db import models as guest_models
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 import trove.common.apischema as apischema
 
 

trove/extensions/security_group/models.py

@@ -22,7 +22,7 @@ from trove.common import exception
 from trove.db.models import DatabaseModelBase
 from trove.common.models import NetworkRemoteModelBase
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 CONF = cfg.CONF

trove/extensions/security_group/service.py

@@ -22,7 +22,7 @@ from trove.extensions.security_group import models
 from trove.extensions.security_group import views
 from trove.instance import models as instance_models
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/api.py

@@ -26,7 +26,7 @@ from trove.openstack.common import rpc
 from trove.openstack.common import log as logging
 from trove.openstack.common.rpc import proxy
 from trove.openstack.common.rpc import common
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/guestagent/backup/backupagent.py

@@ -26,7 +26,7 @@ from trove.guestagent.strategies.backup.base import UnknownBackupType
 from trove.guestagent.strategies.storage import get_storage_strategy
 from trove.guestagent.strategies.backup import get_backup_strategy
 from trove.guestagent.strategies.restore import get_restore_strategy
-from trove.openstack.common.gettextutils import _  # noqa
+from trove.common.i18n import _  # noqa
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/cassandra/manager.py

@@ -21,7 +21,7 @@ from trove.guestagent import volume
 from trove.guestagent.datastore.cassandra import service
 from trove.openstack.common import periodic_task
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.guestagent import dbaas
 
 CONF = cfg.CONF

trove/guestagent/datastore/cassandra/service.py

@@ -24,7 +24,7 @@ from trove.guestagent.datastore.cassandra import system
 from trove.guestagent.datastore import service
 from trove.guestagent import pkg
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/couchbase/manager.py

@@ -25,7 +25,7 @@ from trove.guestagent.datastore.couchbase import service
 from trove.guestagent.datastore.couchbase import system
 from trove.openstack.common import log as logging
 from trove.openstack.common import periodic_task
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/couchbase/service.py

@@ -30,7 +30,7 @@ from trove.guestagent.datastore import service
 from trove.guestagent.datastore.couchbase import system
 from trove.guestagent.db import models
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/mongodb/manager.py

@@ -24,7 +24,7 @@ from trove.guestagent.common import operating_system
 from trove.guestagent.datastore.mongodb import service as mongo_service
 from trove.guestagent.datastore.mongodb import system
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.openstack.common import periodic_task
 
 

trove/guestagent/datastore/mongodb/service.py

@@ -26,7 +26,7 @@ from trove.guestagent.datastore import service
 from trove.guestagent.datastore.mongodb import system
 from trove.openstack.common import log as logging
 from trove.guestagent.common import operating_system
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/mysql/manager.py

@@ -28,7 +28,7 @@ from trove.guestagent.datastore.mysql.service import MySqlAdmin
 from trove.guestagent.datastore.mysql.service import MySqlApp
 from trove.guestagent.strategies.replication import get_replication_strategy
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.openstack.common import periodic_task
 
 

trove/guestagent/datastore/mysql/service.py

@@ -37,7 +37,7 @@ from trove.guestagent.db import models
 from trove.guestagent import pkg
 from trove.guestagent.datastore import service
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 ADMIN_USER_NAME = "os_admin"
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/postgresql/service/access.py

@@ -16,7 +16,7 @@
 from trove.common import cfg
 from trove.guestagent.datastore.postgresql import pgutil
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/postgresql/service/config.py

@@ -20,7 +20,7 @@ from trove.guestagent.datastore.postgresql import pgutil
 from trove.guestagent.datastore.postgresql.service.process import PgSqlProcess
 from trove.guestagent.datastore.postgresql.service.status import PgSqlAppStatus
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/postgresql/service/database.py

@@ -17,7 +17,7 @@ import itertools
 from trove.common import cfg
 from trove.guestagent.datastore.postgresql import pgutil
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/postgresql/service/install.py

@@ -19,7 +19,7 @@ from trove.guestagent import pkg
 from trove.guestagent.datastore.postgresql.service.process import PgSqlProcess
 from trove.guestagent.datastore.postgresql.service.status import PgSqlAppStatus
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/postgresql/service/process.py

@@ -18,7 +18,7 @@ from trove.common import utils
 from trove.guestagent.common import operating_system
 from trove.guestagent.datastore.postgresql.service.status import PgSqlAppStatus
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/postgresql/service/users.py

@@ -18,7 +18,7 @@ from trove.common import cfg
 from trove.guestagent.datastore.postgresql import pgutil
 from trove.guestagent.datastore.postgresql.service.access import PgSqlAccess
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/redis/manager.py

@@ -22,7 +22,7 @@ from trove.guestagent.common import operating_system
 from trove.guestagent.datastore.redis.service import RedisAppStatus
 from trove.guestagent.datastore.redis.service import RedisApp
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.openstack.common import periodic_task
 
 

trove/guestagent/datastore/redis/service.py

@@ -24,7 +24,7 @@ from trove.guestagent.common import operating_system
 from trove.guestagent.datastore import service
 from trove.guestagent.datastore.redis import system
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 TMP_REDIS_CONF = '/tmp/redis.conf.tmp'

trove/guestagent/datastore/service.py

@@ -22,7 +22,7 @@ from trove.common import instance
 from trove.conductor import api as conductor_api
 from trove.guestagent.common import timeutils
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/db/models.py

@@ -19,7 +19,7 @@ import string
 import netaddr
 
 from trove.common import cfg
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 CONF = cfg.CONF
 

trove/guestagent/dbaas.py

@@ -28,7 +28,7 @@ import os
 from trove.openstack.common import log
 from itertools import chain
 from trove.common import cfg
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 LOG = log.getLogger(__name__)

trove/guestagent/models.py

@@ -21,7 +21,7 @@ from trove.common import utils
 from trove.db import get_db_api
 from trove.db import models as dbmodels
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 LOG = logging.getLogger(__name__)
 

trove/guestagent/pkg.py

@@ -29,7 +29,7 @@ from trove.common import utils
 from trove.common.exception import ProcessExecutionError
 from trove.guestagent.common import operating_system
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/strategies/backup/couchbase_impl.py

@@ -21,7 +21,7 @@ from trove.common import utils
 from trove.guestagent.datastore.couchbase import service
 from trove.guestagent.datastore.couchbase import system
 from trove.guestagent.strategies.backup import base
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.openstack.common import log as logging
 
 

trove/guestagent/strategies/replication/mysql_binlog.py

@@ -28,7 +28,7 @@ from trove.guestagent.strategies import backup
 from trove.guestagent.strategies.replication import base
 from trove.guestagent.strategies.storage import get_storage_strategy
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 AGENT = BackupAgent()
 CONF = cfg.CONF

trove/guestagent/strategies/restore/base.py

@@ -17,7 +17,7 @@ from trove.guestagent.strategy import Strategy
 from trove.common import cfg
 from trove.common import utils
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _  # noqa
+from trove.common.i18n import _  # noqa
 from eventlet.green import subprocess
 
 LOG = logging.getLogger(__name__)

trove/guestagent/strategies/restore/mysql_impl.py

@@ -24,7 +24,7 @@ from trove.openstack.common import log as logging
 from trove.common import exception
 from trove.common import utils
 import trove.guestagent.datastore.mysql.service as dbaas
-from trove.openstack.common.gettextutils import _  # noqa
+from trove.common.i18n import _  # noqa
 
 LOG = logging.getLogger(__name__)
 

trove/guestagent/strategies/storage/swift.py

@@ -18,7 +18,7 @@ import hashlib
 
 from trove.guestagent.strategies.storage import base
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _  # noqa
+from trove.common.i18n import _  # noqa
 from trove.common.remote import create_swift_client
 from trove.common import cfg
 

trove/guestagent/volume.py

@@ -22,7 +22,7 @@ from trove.common import utils
 from trove.common.exception import GuestError
 from trove.common.exception import ProcessExecutionError
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 
 TMP_MOUNT_POINT = "/mnt/volume"
 

trove/instance/models.py

@@ -39,10 +39,9 @@ from trove.instance.tasks import InstanceTask
 from trove.instance.tasks import InstanceTasks
 from trove.taskmanager import api as task_api
 from trove.openstack.common import log as logging
-from trove.openstack.common import gettextutils
+from trove.common import i18n as i18n
 
-(_, _LE, _LI, _LW) = (gettextutils._, gettextutils._LE, gettextutils._LI,
-                      gettextutils._LW)
+(_, _LE, _LI, _LW) = (i18n._, i18n._LE, i18n._LI, i18n._LW)
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/instance/service.py

@@ -27,8 +27,8 @@ from trove.datastore import models as datastore_models
 from trove.backup.models import Backup as backup_model
 from trove.backup import views as backup_views
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
-from trove.openstack.common.gettextutils import _LI
+from trove.common.i18n import _
+from trove.common.i18n import _LI
 import trove.common.apischema as apischema
 
 

trove/quota/quota.py

@@ -19,7 +19,7 @@ from oslo.config import cfg
 from oslo.utils import importutils
 
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.common import exception
 from trove.quota.models import Quota
 from trove.quota.models import QuotaUsage

trove/taskmanager/models.py

@@ -64,7 +64,7 @@ from trove.instance.tasks import InstanceTasks
 from trove.instance.models import InstanceStatus
 from trove.instance.models import InstanceServiceStatus
 from trove.openstack.common import log as logging
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.openstack.common.notifier import api as notifier
 from trove.quota.quota import run_with_quotas
 import trove.common.remote as remote

trove/tests/db/migrations.py

@@ -38,7 +38,7 @@ import sqlalchemy
 import sqlalchemy.exc
 
 import trove.db.sqlalchemy.migrate_repo
-from trove.openstack.common.gettextutils import _
+from trove.common.i18n import _
 from trove.openstack.common import log as logging
 from trove.openstack.common import processutils
 from trove.tests.util import event_simulator

trove/tests/fakes/swift.py

@@ -26,7 +26,7 @@ from mock import MagicMock
 
 from swiftclient import client as swift
 
-from trove.openstack.common.gettextutils import _  # noqa
+from trove.common.i18n import _  # noqa
 
 LOG = logging.getLogger(__name__)