diff --git a/glance/api/authorization.py b/glance/api/authorization.py
index e64adc4e64..7cea2c0da2 100644
--- a/glance/api/authorization.py
+++ b/glance/api/authorization.py
@@ -18,9 +18,7 @@ import copy
 
 from glance.common import exception
 import glance.domain.proxy
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 
 def is_image_mutable(context, image):
diff --git a/glance/api/common.py b/glance/api/common.py
index 505ac41ffa..b8a83e6c80 100644
--- a/glance/api/common.py
+++ b/glance/api/common.py
@@ -23,12 +23,9 @@ from oslo_utils import units
 
 from glance.common import exception
 from glance.common import wsgi
-from glance import i18n
+from glance.i18n import _, _LE, _LW
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LW = i18n._LW
 CONF = cfg.CONF
 
 _CACHED_THREAD_POOL = {}
diff --git a/glance/api/middleware/cache.py b/glance/api/middleware/cache.py
index e321259f93..3a5b50b292 100644
--- a/glance/api/middleware/cache.py
+++ b/glance/api/middleware/cache.py
@@ -34,14 +34,12 @@ from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
 import glance.db
-from glance import i18n
+from glance.i18n import _LE, _LI
 from glance import image_cache
 from glance import notifier
 import glance.registry.client.v1.api as registry
 
 LOG = logging.getLogger(__name__)
-_LI = i18n._LI
-_LE = i18n._LE
 
 PATTERNS = {
     ('v1', 'GET'): re.compile(r'^/v1/images/([^\/]+)$'),
diff --git a/glance/api/middleware/cache_manage.py b/glance/api/middleware/cache_manage.py
index d91ac37d4c..77c6954193 100644
--- a/glance/api/middleware/cache_manage.py
+++ b/glance/api/middleware/cache_manage.py
@@ -22,10 +22,9 @@ import routes
 
 from glance.api import cached_images
 from glance.common import wsgi
-from glance import i18n
+from glance.i18n import _LI
 
 LOG = logging.getLogger(__name__)
-_LI = i18n._LI
 
 
 class CacheManageFilter(wsgi.Middleware):
diff --git a/glance/api/middleware/context.py b/glance/api/middleware/context.py
index 8245431d2b..f92c8c6ba4 100644
--- a/glance/api/middleware/context.py
+++ b/glance/api/middleware/context.py
@@ -21,9 +21,8 @@ import webob.exc
 from glance.api import policy
 from glance.common import wsgi
 import glance.context
-from glance import i18n
+from glance.i18n import _
 
-_ = i18n._
 
 context_opts = [
     cfg.BoolOpt('owner_is_tenant', default=True,
diff --git a/glance/api/middleware/gzip.py b/glance/api/middleware/gzip.py
index d4c5141f38..e3af334df5 100644
--- a/glance/api/middleware/gzip.py
+++ b/glance/api/middleware/gzip.py
@@ -22,10 +22,9 @@ import re
 from oslo_log import log as logging
 
 from glance.common import wsgi
-from glance import i18n
+from glance.i18n import _LI
 
 LOG = logging.getLogger(__name__)
-_LI = i18n._LI
 
 
 class GzipMiddleware(wsgi.Middleware):
diff --git a/glance/api/middleware/version_negotiation.py b/glance/api/middleware/version_negotiation.py
index cadd6f013f..9864ab196e 100644
--- a/glance/api/middleware/version_negotiation.py
+++ b/glance/api/middleware/version_negotiation.py
@@ -24,13 +24,10 @@ from oslo_log import log as logging
 
 from glance.api import versions
 from glance.common import wsgi
-from glance import i18n
 
 CONF = cfg.CONF
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LW = i18n._LW
 
 
 class VersionNegotiationFilter(wsgi.Middleware):
diff --git a/glance/api/policy.py b/glance/api/policy.py
index 41651e3b88..72e2c0ce8f 100644
--- a/glance/api/policy.py
+++ b/glance/api/policy.py
@@ -24,7 +24,7 @@ from oslo_policy import policy
 
 from glance.common import exception
 import glance.domain.proxy
-from glance import i18n
+from glance.i18n import _
 
 
 LOG = logging.getLogger(__name__)
@@ -36,8 +36,6 @@ DEFAULT_RULES = policy.Rules.from_dict({
     'manage_image_cache': 'role:admin',
 })
 
-_ = i18n._
-
 
 class Enforcer(policy.Enforcer):
     """Responsible for loading and enforcing rules"""
diff --git a/glance/api/v1/controller.py b/glance/api/v1/controller.py
index a660a1c317..e56485deb9 100644
--- a/glance/api/v1/controller.py
+++ b/glance/api/v1/controller.py
@@ -18,12 +18,11 @@ from oslo_log import log as logging
 import webob.exc
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _
 import glance.registry.client.v1.api as registry
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 class BaseController(object):
diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py
index 39da863af8..46acee8a7b 100644
--- a/glance/api/v1/images.py
+++ b/glance/api/v1/images.py
@@ -47,16 +47,12 @@ from glance.common import property_utils
 from glance.common import store_utils
 from glance.common import utils
 from glance.common import wsgi
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 from glance import notifier
 import glance.registry.client.v1.api as registry
 from oslo_utils import timeutils
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-_LW = i18n._LW
 SUPPORTED_PARAMS = glance.api.v1.SUPPORTED_PARAMS
 SUPPORTED_FILTERS = glance.api.v1.SUPPORTED_FILTERS
 ACTIVE_IMMUTABLE = glance.api.v1.ACTIVE_IMMUTABLE
diff --git a/glance/api/v1/members.py b/glance/api/v1/members.py
index 6e6eba63f8..de4fa78acd 100644
--- a/glance/api/v1/members.py
+++ b/glance/api/v1/members.py
@@ -24,11 +24,10 @@ from glance.api.v1 import controller
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
-from glance import i18n
+from glance.i18n import _
 import glance.registry.client.v1.api as registry
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 CONF = cfg.CONF
 CONF.import_opt('image_member_quota', 'glance.common.config')
 
diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py
index 5a12f0cdb4..bfdd264f76 100644
--- a/glance/api/v1/upload_utils.py
+++ b/glance/api/v1/upload_utils.py
@@ -23,15 +23,12 @@ from glance.common import exception
 from glance.common import store_utils
 from glance.common import utils
 import glance.db
-from glance import i18n
+from glance.i18n import _, _LE, _LI
 import glance.registry.client.v1.api as registry
 
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
 
 
 def initiate_deletion(req, location_data, id):
diff --git a/glance/api/v2/image_actions.py b/glance/api/v2/image_actions.py
index a19a72b6f6..8011041067 100644
--- a/glance/api/v2/image_actions.py
+++ b/glance/api/v2/image_actions.py
@@ -22,13 +22,11 @@ from glance.common import utils
 from glance.common import wsgi
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _LI
 import glance.notifier
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LI = i18n._LI
 
 
 class ImageActionsController(object):
diff --git a/glance/api/v2/image_data.py b/glance/api/v2/image_data.py
index f15a882102..542e50be05 100644
--- a/glance/api/v2/image_data.py
+++ b/glance/api/v2/image_data.py
@@ -24,13 +24,11 @@ from glance.common import utils
 from glance.common import wsgi
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _, _LE
 import glance.notifier
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
 
 
 class ImageDataController(object):
diff --git a/glance/api/v2/image_members.py b/glance/api/v2/image_members.py
index bc64d4b60a..b9fc8a542d 100644
--- a/glance/api/v2/image_members.py
+++ b/glance/api/v2/image_members.py
@@ -29,13 +29,12 @@ from glance.common import utils
 from glance.common import wsgi
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _
 import glance.notifier
 import glance.schema
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 class ImageMembersController(object):
diff --git a/glance/api/v2/image_tags.py b/glance/api/v2/image_tags.py
index 78af4bf505..c79337ece6 100644
--- a/glance/api/v2/image_tags.py
+++ b/glance/api/v2/image_tags.py
@@ -23,12 +23,11 @@ from glance.common import utils
 from glance.common import wsgi
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _
 import glance.notifier
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 class Controller(object):
diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py
index bb7949c3bd..bbf813b88a 100644
--- a/glance/api/v2/images.py
+++ b/glance/api/v2/images.py
@@ -32,13 +32,11 @@ from glance.common import utils
 from glance.common import wsgi
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _, _LW
 import glance.notifier
 import glance.schema
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LW = i18n._LW
 
 CONF = cfg.CONF
 CONF.import_opt('disk_formats', 'glance.common.config', group='image_format')
diff --git a/glance/api/v2/metadef_namespaces.py b/glance/api/v2/metadef_namespaces.py
index 1d2a72def5..a40da71148 100644
--- a/glance/api/v2/metadef_namespaces.py
+++ b/glance/api/v2/metadef_namespaces.py
@@ -35,13 +35,11 @@ from glance.common import wsgi
 from glance.common import wsme_utils
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _, _LE
 import glance.notifier
 import glance.schema
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
 
 CONF = cfg.CONF
 
diff --git a/glance/api/v2/metadef_objects.py b/glance/api/v2/metadef_objects.py
index ff3ef00981..ae3dbfe019 100644
--- a/glance/api/v2/metadef_objects.py
+++ b/glance/api/v2/metadef_objects.py
@@ -29,12 +29,11 @@ from glance.common import exception
 from glance.common import wsgi
 from glance.common import wsme_utils
 import glance.db
-from glance import i18n
+from glance.i18n import _
 import glance.notifier
 import glance.schema
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 CONF = cfg.CONF
 
diff --git a/glance/api/v2/metadef_properties.py b/glance/api/v2/metadef_properties.py
index d1873d7932..ff6df70021 100644
--- a/glance/api/v2/metadef_properties.py
+++ b/glance/api/v2/metadef_properties.py
@@ -29,12 +29,11 @@ from glance.common import exception
 from glance.common import wsgi
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _
 import glance.notifier
 import glance.schema
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 class NamespacePropertiesController(object):
diff --git a/glance/api/v2/metadef_resource_types.py b/glance/api/v2/metadef_resource_types.py
index ef64870cb9..8b64a05063 100644
--- a/glance/api/v2/metadef_resource_types.py
+++ b/glance/api/v2/metadef_resource_types.py
@@ -29,12 +29,11 @@ from glance.common import exception
 from glance.common import wsgi
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _
 import glance.notifier
 import glance.schema
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 class ResourceTypeController(object):
diff --git a/glance/api/v2/metadef_tags.py b/glance/api/v2/metadef_tags.py
index 57ab14a250..e69b75dfa6 100644
--- a/glance/api/v2/metadef_tags.py
+++ b/glance/api/v2/metadef_tags.py
@@ -28,14 +28,11 @@ from glance.common import exception
 from glance.common import wsgi
 from glance.common import wsme_utils
 import glance.db
-from glance import i18n
+from glance.i18n import _
 import glance.notifier
 import glance.schema
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
 
 CONF = cfg.CONF
 
diff --git a/glance/api/v2/tasks.py b/glance/api/v2/tasks.py
index 0b31e1a018..6aa38a8c46 100644
--- a/glance/api/v2/tasks.py
+++ b/glance/api/v2/tasks.py
@@ -33,13 +33,11 @@ from glance.common import exception
 from glance.common import wsgi
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _, _LW
 import glance.notifier
 import glance.schema
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LW = i18n._LW
 
 CONF = cfg.CONF
 CONF.import_opt('task_time_to_live', 'glance.common.config', group='task')
diff --git a/glance/api/v3/artifacts.py b/glance/api/v3/artifacts.py
index df1a18054d..b53940d3a5 100644
--- a/glance/api/v3/artifacts.py
+++ b/glance/api/v3/artifacts.py
@@ -35,12 +35,10 @@ from glance.common import jsonpatchvalidator
 from glance.common import utils
 from glance.common import wsgi
 import glance.db
-from glance import i18n
+from glance.i18n import _, _LE
 from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
-_LE = i18n._LE
-_ = i18n._
 
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
                                                 os.pardir,
diff --git a/glance/api/versions.py b/glance/api/versions.py
index 0407719400..37406da4e5 100644
--- a/glance/api/versions.py
+++ b/glance/api/versions.py
@@ -20,9 +20,8 @@ from six.moves import http_client
 import webob.dec
 
 from glance.common import wsgi
-from glance import i18n
+from glance.i18n import _
 
-_ = i18n._
 
 versions_opts = [
     cfg.StrOpt('public_endpoint',
diff --git a/glance/artifacts/dependency.py b/glance/artifacts/dependency.py
index 1985006ff8..5d7c6c7e5e 100644
--- a/glance/artifacts/dependency.py
+++ b/glance/artifacts/dependency.py
@@ -15,9 +15,7 @@
 from glance.artifacts.domain import proxy
 import glance.common.artifacts.definitions as definitions
 import glance.common.exception as exc
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 
 class ArtifactProxy(proxy.Artifact):
diff --git a/glance/artifacts/domain/__init__.py b/glance/artifacts/domain/__init__.py
index 9fa97e6a58..569b0be20d 100644
--- a/glance/artifacts/domain/__init__.py
+++ b/glance/artifacts/domain/__init__.py
@@ -16,9 +16,7 @@ import uuid
 
 from oslo_utils import timeutils
 
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 
 class Artifact(object):
diff --git a/glance/artifacts/location.py b/glance/artifacts/location.py
index 3f7df74231..2eceb1c93d 100644
--- a/glance/artifacts/location.py
+++ b/glance/artifacts/location.py
@@ -22,11 +22,7 @@ from oslo_utils import encodeutils
 from glance.artifacts.domain import proxy
 from glance.common.artifacts import definitions
 from glance.common import utils
-from glance import i18n
-
-_ = i18n._
-_LE = i18n._LE
-_LW = i18n._LW
+from glance.i18n import _, _LE, _LW
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
diff --git a/glance/artifacts/updater.py b/glance/artifacts/updater.py
index 9e3fccc557..09976a9376 100644
--- a/glance/artifacts/updater.py
+++ b/glance/artifacts/updater.py
@@ -14,9 +14,7 @@
 
 from glance.artifacts.domain import proxy
 from glance.common import exception as exc
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 
 class ArtifactProxy(proxy.Artifact):
diff --git a/glance/async/__init__.py b/glance/async/__init__.py
index ebc2c2aed1..b637745bd6 100644
--- a/glance/async/__init__.py
+++ b/glance/async/__init__.py
@@ -15,11 +15,10 @@
 
 from oslo_log import log as logging
 
-from glance import i18n
+from glance.i18n import _LE
 
 
 LOG = logging.getLogger(__name__)
-_LE = i18n._LE
 
 
 class TaskExecutor(object):
diff --git a/glance/async/flows/base_import.py b/glance/async/flows/base_import.py
index 293d024503..3d8aea8eca 100644
--- a/glance/async/flows/base_import.py
+++ b/glance/async/flows/base_import.py
@@ -33,13 +33,10 @@ from taskflow.types import failure
 from glance.common import exception
 from glance.common.scripts.image_import import main as image_import
 from glance.common.scripts import utils as script_utils
-from glance import i18n
+from glance.i18n import _, _LE, _LI
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
 
 
 CONF = cfg.CONF
diff --git a/glance/async/flows/convert.py b/glance/async/flows/convert.py
index 93da93e004..1f403e7900 100644
--- a/glance/async/flows/convert.py
+++ b/glance/async/flows/convert.py
@@ -21,12 +21,8 @@ from oslo_config import cfg
 from taskflow.patterns import linear_flow as lf
 from taskflow import task
 
-from glance import i18n
+from glance.i18n import _, _LW
 
-_ = i18n._
-_LI = i18n._LI
-_LE = i18n._LE
-_LW = i18n._LW
 LOG = logging.getLogger(__name__)
 
 convert_task_opts = [
diff --git a/glance/async/flows/introspect.py b/glance/async/flows/introspect.py
index ad65e6aa37..93ab10a366 100644
--- a/glance/async/flows/introspect.py
+++ b/glance/async/flows/introspect.py
@@ -21,10 +21,9 @@ from oslo_utils import excutils
 from taskflow.patterns import linear_flow as lf
 
 from glance.async import utils
-from glance import i18n
+from glance.i18n import _LE
 
 
-_LE = i18n._LE
 LOG = logging.getLogger(__name__)
 
 
diff --git a/glance/async/taskflow_executor.py b/glance/async/taskflow_executor.py
index 747f3ba265..d099c54571 100644
--- a/glance/async/taskflow_executor.py
+++ b/glance/async/taskflow_executor.py
@@ -28,10 +28,8 @@ from taskflow.listeners import logging as llistener
 import glance.async
 from glance.common import exception
 from glance.common.scripts import utils as script_utils
-from glance import i18n
+from glance.i18n import _, _LE
 
-_ = i18n._
-_LE = i18n._LE
 LOG = logging.getLogger(__name__)
 
 _deprecated_opt = cfg.DeprecatedOpt('eventlet_executor_pool_size',
diff --git a/glance/async/utils.py b/glance/async/utils.py
index 2f83ddc011..068c704a1d 100644
--- a/glance/async/utils.py
+++ b/glance/async/utils.py
@@ -17,11 +17,10 @@ from oslo_log import log as logging
 import six
 from taskflow import task
 
-from glance import i18n
+from glance.i18n import _LW
 
 
 LOG = logging.getLogger(__name__)
-_LW = i18n._LW
 
 
 class OptionalTask(task.Task):
diff --git a/glance/cmd/__init__.py b/glance/cmd/__init__.py
index 734e3090e1..eef4efc25b 100644
--- a/glance/cmd/__init__.py
+++ b/glance/cmd/__init__.py
@@ -44,7 +44,7 @@ def fix_greendns_ipv6():
                          "if using ipv6 since eventlet.greendns currently "
                          "breaks with ipv6 addresses. Please ensure that "
                          "eventlet is not imported prior to this being set.")
-            raise ImportError(msg % (nogreendns))
+            raise ImportError(msg % nogreendns)
 
         os.environ[nogreendns] = 'yes'
 
diff --git a/glance/cmd/control.py b/glance/cmd/control.py
index e2e480af09..64a26635ab 100644
--- a/glance/cmd/control.py
+++ b/glance/cmd/control.py
@@ -45,9 +45,7 @@ from oslo_utils import units
 from six.moves import range
 
 from glance.common import config
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 CONF = cfg.CONF
 
diff --git a/glance/cmd/manage.py b/glance/cmd/manage.py
index edd6fa7588..79620db93d 100755
--- a/glance/cmd/manage.py
+++ b/glance/cmd/manage.py
@@ -49,12 +49,11 @@ from glance.common import exception
 from glance.db import migration as db_migration
 from glance.db.sqlalchemy import api as db_api
 from glance.db.sqlalchemy import metadata
-from glance import i18n
+from glance.i18n import _
 
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 # Decorators for actions
diff --git a/glance/cmd/replicator.py b/glance/cmd/replicator.py
index 295ce9bda0..ec492ee1ad 100755
--- a/glance/cmd/replicator.py
+++ b/glance/cmd/replicator.py
@@ -34,13 +34,9 @@ from webob import exc
 from glance.common import config
 from glance.common import exception
 from glance.common import utils
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LI = i18n._LI
-_LE = i18n._LE
-_LW = i18n._LW
 
 
 # NOTE: positional arguments <args> will be parsed before <command> until
diff --git a/glance/common/artifacts/declarative.py b/glance/common/artifacts/declarative.py
index 9595a1e2f5..39f99bddcc 100644
--- a/glance/common/artifacts/declarative.py
+++ b/glance/common/artifacts/declarative.py
@@ -19,10 +19,7 @@ import semantic_version
 import six
 
 from glance.common import exception as exc
-from glance import i18n
-
-
-_ = i18n._
+from glance.i18n import _
 
 
 class AttributeDefinition(object):
diff --git a/glance/common/artifacts/definitions.py b/glance/common/artifacts/definitions.py
index aa4f3b6ac5..d23b86505f 100644
--- a/glance/common/artifacts/definitions.py
+++ b/glance/common/artifacts/definitions.py
@@ -21,10 +21,7 @@ import six
 
 from glance.common.artifacts import declarative
 import glance.common.exception as exc
-from glance import i18n
-
-
-_ = i18n._
+from glance.i18n import _
 
 
 class Text(declarative.PropertyDefinition):
diff --git a/glance/common/artifacts/loader.py b/glance/common/artifacts/loader.py
index a42ce18306..bb185bae26 100644
--- a/glance/common/artifacts/loader.py
+++ b/glance/common/artifacts/loader.py
@@ -21,15 +21,10 @@ from stevedore import enabled
 
 from glance.common.artifacts import definitions
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LW = i18n._LW
-_LI = i18n._LI
-
 
 plugins_opts = [
     cfg.BoolOpt('load_enabled', default=True,
diff --git a/glance/common/artifacts/serialization.py b/glance/common/artifacts/serialization.py
index bd783e711d..77693afaf4 100644
--- a/glance/common/artifacts/serialization.py
+++ b/glance/common/artifacts/serialization.py
@@ -20,11 +20,9 @@ from glance import artifacts as ga
 from glance.common.artifacts import declarative
 from glance.common.artifacts import definitions
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _
 
 
-_ = i18n._
-
 COMMON_ARTIFACT_PROPERTIES = ['id',
                               'type_name',
                               'type_version',
diff --git a/glance/common/auth.py b/glance/common/auth.py
index 1c457ce306..3efdef438a 100644
--- a/glance/common/auth.py
+++ b/glance/common/auth.py
@@ -36,11 +36,10 @@ from six.moves import range
 import six.moves.urllib.parse as urlparse
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 class BaseStrategy(object):
@@ -126,7 +125,7 @@ class KeystoneStrategy(BaseStrategy):
 
         self.check_auth_params()
         auth_url = self.creds['auth_url']
-        for _ in range(self.MAX_REDIRECTS):
+        for redirect_iter in range(self.MAX_REDIRECTS):
             try:
                 _authenticate(auth_url)
             except exception.AuthorizationRedirect as e:
diff --git a/glance/common/client.py b/glance/common/client.py
index d413476d78..73186f334b 100644
--- a/glance/common/client.py
+++ b/glance/common/client.py
@@ -50,10 +50,9 @@ import six.moves.urllib.parse as urlparse
 from glance.common import auth
 from glance.common import exception
 from glance.common import utils
-from glance import i18n
+from glance.i18n import _
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 # common chunk size for get and put
 CHUNKSIZE = 65536
@@ -83,7 +82,7 @@ def handle_redirects(func):
 
     @functools.wraps(func)
     def wrapped(self, method, url, body, headers):
-        for _ in range(MAX_REDIRECTS):
+        for i in range(MAX_REDIRECTS):
             try:
                 return func(self, method, url, body, headers)
             except exception.RedirectException as redirect:
diff --git a/glance/common/config.py b/glance/common/config.py
index 51ea8136f9..66093f7dec 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -28,11 +28,9 @@ from oslo_config import cfg
 from oslo_policy import policy
 from paste import deploy
 
-from glance import i18n
+from glance.i18n import _
 from glance.version import version_info as version
 
-_ = i18n._
-
 paste_deploy_opts = [
     cfg.StrOpt('flavor',
                help=_('Partial name of a pipeline in your paste configuration '
diff --git a/glance/common/exception.py b/glance/common/exception.py
index c3138ed07e..b1255bd4f8 100644
--- a/glance/common/exception.py
+++ b/glance/common/exception.py
@@ -19,9 +19,7 @@
 import six
 import six.moves.urllib.parse as urlparse
 
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 _FATAL_EXCEPTION_FORMAT_ERRORS = False
 
diff --git a/glance/common/jsonpatchvalidator.py b/glance/common/jsonpatchvalidator.py
index 4fb6a1e382..7269bb77e2 100644
--- a/glance/common/jsonpatchvalidator.py
+++ b/glance/common/jsonpatchvalidator.py
@@ -24,9 +24,7 @@ import re
 import jsonschema
 
 import glance.common.exception as exc
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 
 class JsonPatchValidatorMixin(object):
diff --git a/glance/common/location_strategy/__init__.py b/glance/common/location_strategy/__init__.py
index 22fc9dc755..b954ea27fc 100644
--- a/glance/common/location_strategy/__init__.py
+++ b/glance/common/location_strategy/__init__.py
@@ -19,10 +19,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 import stevedore
 
-from glance import i18n
-
-_ = i18n._
-_LE = i18n._LE
+from glance.i18n import _, _LE
 
 location_strategy_opts = [
     cfg.StrOpt('location_strategy', default='location_order',
diff --git a/glance/common/location_strategy/store_type.py b/glance/common/location_strategy/store_type.py
index 867c7222f8..dba679f3ff 100644
--- a/glance/common/location_strategy/store_type.py
+++ b/glance/common/location_strategy/store_type.py
@@ -19,9 +19,8 @@ from oslo_config import cfg
 import six
 import six.moves.urllib.parse as urlparse
 
-from glance import i18n
+from glance.i18n import _
 
-_ = i18n._
 
 store_type_opts = [
     cfg.ListOpt("store_type_preference",
diff --git a/glance/common/property_utils.py b/glance/common/property_utils.py
index af7a544e64..670c241435 100644
--- a/glance/common/property_utils.py
+++ b/glance/common/property_utils.py
@@ -22,14 +22,12 @@ from six.moves import configparser
 
 import glance.api.policy
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _, _LE
 
 # NOTE(bourke): The default dict_type is collections.OrderedDict in py27, but
 # we must set manually for compatibility with py26
 CONFIG = configparser.SafeConfigParser(dict_type=OrderedDict)
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
 
 property_opts = [
     cfg.StrOpt('property_protection_file',
diff --git a/glance/common/rpc.py b/glance/common/rpc.py
index 2b32691ab2..47066d52ea 100644
--- a/glance/common/rpc.py
+++ b/glance/common/rpc.py
@@ -30,11 +30,9 @@ from webob import exc
 from glance.common import client
 from glance.common import exception
 from glance.common import wsgi
-from glance import i18n
+from glance.i18n import _, _LE
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
 
 
 rpc_opts = [
diff --git a/glance/common/scripts/__init__.py b/glance/common/scripts/__init__.py
index 5581167e8c..49542346c1 100644
--- a/glance/common/scripts/__init__.py
+++ b/glance/common/scripts/__init__.py
@@ -16,11 +16,9 @@
 from oslo_log import log as logging
 
 from glance.common.scripts.image_import import main as image_import
-from glance import i18n
+from glance.i18n import _LE, _LI
 
 
-_LI = i18n._LI
-_LE = i18n._LE
 LOG = logging.getLogger(__name__)
 
 
diff --git a/glance/common/scripts/image_import/main.py b/glance/common/scripts/image_import/main.py
index 6b2df02df7..ca5b2d36be 100644
--- a/glance/common/scripts/image_import/main.py
+++ b/glance/common/scripts/image_import/main.py
@@ -27,14 +27,9 @@ from glance.api.v2 import images as v2_api
 from glance.common import exception
 from glance.common.scripts import utils as script_utils
 from glance.common import store_utils
-from glance import i18n
-
+from glance.i18n import _, _LE, _LI, _LW
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-_LW = i18n._LW
 
 
 def run(t_id, context, task_repo, image_repo, image_factory):
diff --git a/glance/common/scripts/utils.py b/glance/common/scripts/utils.py
index a4787a9805..894f82bf6b 100644
--- a/glance/common/scripts/utils.py
+++ b/glance/common/scripts/utils.py
@@ -26,12 +26,9 @@ from oslo_log import log as logging
 from six.moves import urllib
 
 from glance.common import exception
-from glance import i18n
-
+from glance.i18n import _, _LE
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
 
 
 def get_task(task_repo, task_id):
diff --git a/glance/common/semver_db.py b/glance/common/semver_db.py
index 0d7bdc4af6..8660c57a88 100644
--- a/glance/common/semver_db.py
+++ b/glance/common/semver_db.py
@@ -19,13 +19,11 @@ from sqlalchemy.orm.properties import CompositeProperty
 from sqlalchemy import sql
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _
 
 MAX_COMPONENT_LENGTH = pow(2, 16) - 1
 MAX_NUMERIC_PRERELEASE_LENGTH = 6
 
-_ = i18n._
-
 
 class DBVersion(object):
     def __init__(self, components_long, prerelease, build):
diff --git a/glance/common/signature_utils.py b/glance/common/signature_utils.py
index 5cbf74659b..12df056fa9 100644
--- a/glance/common/signature_utils.py
+++ b/glance/common/signature_utils.py
@@ -31,11 +31,9 @@ from oslo_utils import encodeutils
 import six
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _LE
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
 
 
 # Note: This is the signature hash method, which is independent from the
diff --git a/glance/common/store_utils.py b/glance/common/store_utils.py
index 0ea62fe372..3390081f02 100644
--- a/glance/common/store_utils.py
+++ b/glance/common/store_utils.py
@@ -21,13 +21,10 @@ from oslo_utils import encodeutils
 import six.moves.urllib.parse as urlparse
 
 import glance.db as db_api
-from glance import i18n
+from glance.i18n import _LE, _LW
 from glance import scrubber
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LW = i18n._LW
 
 CONF = cfg.CONF
 
diff --git a/glance/common/swift_store_utils.py b/glance/common/swift_store_utils.py
index 0a587a7686..5f91da7a4c 100644
--- a/glance/common/swift_store_utils.py
+++ b/glance/common/swift_store_utils.py
@@ -18,10 +18,7 @@ from oslo_log import log as logging
 from six.moves import configparser
 
 from glance.common import exception
-from glance import i18n
-
-_ = i18n._
-_LE = i18n._LE
+from glance.i18n import _, _LE
 
 swift_opts = [
     cfg.StrOpt('default_swift_reference',
diff --git a/glance/common/utils.py b/glance/common/utils.py
index 891371f5b7..5dc4bec2f4 100644
--- a/glance/common/utils.py
+++ b/glance/common/utils.py
@@ -43,13 +43,11 @@ import six
 from webob import exc
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _, _LE
 
 CONF = cfg.CONF
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
 
 # Whitelist of v1 API headers of form x-image-meta-xxx
 IMAGE_META_HEADERS = ['x-image-meta-location', 'x-image-meta-size',
@@ -376,7 +374,7 @@ class PrettyTable(object):
     def make_header(self):
         label_parts = []
         break_parts = []
-        for width, label, _ in self.columns:
+        for width, label, just in self.columns:
             # NOTE(sirp): headers are always left justified
             label_part = self._clip_and_justify(label, width, 'l')
             label_parts.append(label_part)
@@ -391,7 +389,7 @@ class PrettyTable(object):
     def make_row(self, *args):
         row = args
         row_parts = []
-        for data, (width, _, just) in zip(row, self.columns):
+        for data, (width, label, just) in zip(row, self.columns):
             row_part = self._clip_and_justify(data, width, just)
             row_parts.append(row_part)
 
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
index 243edb9fe0..fd17ef0377 100644
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.py
@@ -48,13 +48,9 @@ from webob import multidict
 from glance.common import exception
 from glance.common import utils
 from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 
 
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-_LW = i18n._LW
-
 bind_opts = [
     cfg.StrOpt('bind_host', default='0.0.0.0',
                help=_('Address to bind the server.  Useful when '
diff --git a/glance/contrib/plugins/image_artifact/v2/image.py b/glance/contrib/plugins/image_artifact/v2/image.py
index cf60021533..a26f6605e7 100644
--- a/glance/contrib/plugins/image_artifact/v2/image.py
+++ b/glance/contrib/plugins/image_artifact/v2/image.py
@@ -19,10 +19,7 @@ import glance.contrib.plugins.image_artifact.v1_1.image as v1_1
 import glanceclient
 
 
-from glance import i18n
-
-
-_ = i18n._
+from glance.i18n import _
 
 
 class ImageAsAnArtifact(v1_1.ImageAsAnArtifact):
diff --git a/glance/db/__init__.py b/glance/db/__init__.py
index 9dd600d13b..ed9a02af40 100644
--- a/glance/db/__init__.py
+++ b/glance/db/__init__.py
@@ -29,9 +29,7 @@ from glance.common import exception
 from glance.common import location_strategy
 import glance.domain
 import glance.domain.proxy
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 CONF = cfg.CONF
 CONF.import_opt('image_size_cap', 'glance.common.config')
diff --git a/glance/db/simple/api.py b/glance/db/simple/api.py
index ba08c42dc2..21bd77ab4f 100644
--- a/glance/db/simple/api.py
+++ b/glance/db/simple/api.py
@@ -25,12 +25,10 @@ import six
 
 from glance.common import exception
 from glance.common import utils
-from glance import i18n
+from glance.i18n import _, _LI, _LW
+
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LI = i18n._LI
-_LW = i18n._LW
 
 DATA = {
     'images': {},
diff --git a/glance/db/sqlalchemy/api.py b/glance/db/sqlalchemy/api.py
index e693b31002..7dbbce0ac0 100644
--- a/glance/db/sqlalchemy/api.py
+++ b/glance/db/sqlalchemy/api.py
@@ -50,13 +50,11 @@ from glance.db.sqlalchemy.metadef_api import object as metadef_object_api
 from glance.db.sqlalchemy.metadef_api import property as metadef_property_api
 from glance.db.sqlalchemy.metadef_api import tag as metadef_tag_api
 from glance.db.sqlalchemy import models
-from glance import i18n
+from glance.i18n import _, _LW
 
 BASE = models.BASE
 sa_logger = None
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LW = i18n._LW
 
 
 STATUSES = ['active', 'saving', 'queued', 'killed', 'pending_delete',
diff --git a/glance/db/sqlalchemy/artifacts.py b/glance/db/sqlalchemy/artifacts.py
index 215541f353..32401ecea2 100644
--- a/glance/db/sqlalchemy/artifacts.py
+++ b/glance/db/sqlalchemy/artifacts.py
@@ -31,12 +31,10 @@ import glance.artifacts as ga
 from glance.common import exception
 from glance.common import semver_db
 from glance.db.sqlalchemy import models_artifacts as models
-from glance import i18n
+from glance.i18n import _LE, _LW
 from oslo_log import log as os_logging
 
 LOG = os_logging.getLogger(__name__)
-_LW = i18n._LW
-_LE = i18n._LE
 
 CONF = cfg.CONF
 
diff --git a/glance/db/sqlalchemy/metadata.py b/glance/db/sqlalchemy/metadata.py
index 7caae81e96..65bbba09cf 100644
--- a/glance/db/sqlalchemy/metadata.py
+++ b/glance/db/sqlalchemy/metadata.py
@@ -33,13 +33,9 @@ from sqlalchemy import and_
 from sqlalchemy.schema import MetaData
 from sqlalchemy.sql import select
 
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LW = i18n._LW
-_LI = i18n._LI
 
 metadata_opts = [
     cfg.StrOpt('metadata_source_path', default='/etc/glance/metadefs/',
diff --git a/glance/db/sqlalchemy/metadef_api/namespace.py b/glance/db/sqlalchemy/metadef_api/namespace.py
index eab7155eab..9a03c82399 100644
--- a/glance/db/sqlalchemy/metadef_api/namespace.py
+++ b/glance/db/sqlalchemy/metadef_api/namespace.py
@@ -22,10 +22,9 @@ import sqlalchemy.orm as sa_orm
 from glance.common import exception as exc
 import glance.db.sqlalchemy.metadef_api as metadef_api
 from glance.db.sqlalchemy import models_metadef as models
-from glance import i18n
+from glance.i18n import _
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 def _is_namespace_visible(context, namespace, status=None):
diff --git a/glance/db/sqlalchemy/metadef_api/object.py b/glance/db/sqlalchemy/metadef_api/object.py
index 6625e6f081..48862522fe 100644
--- a/glance/db/sqlalchemy/metadef_api/object.py
+++ b/glance/db/sqlalchemy/metadef_api/object.py
@@ -22,10 +22,9 @@ from glance.common import exception as exc
 from glance.db.sqlalchemy.metadef_api import namespace as namespace_api
 import glance.db.sqlalchemy.metadef_api.utils as metadef_utils
 from glance.db.sqlalchemy import models_metadef as models
-from glance import i18n
+from glance.i18n import _
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 def _get(context, object_id, session):
diff --git a/glance/db/sqlalchemy/metadef_api/property.py b/glance/db/sqlalchemy/metadef_api/property.py
index 53d013668c..eba5c0fc30 100644
--- a/glance/db/sqlalchemy/metadef_api/property.py
+++ b/glance/db/sqlalchemy/metadef_api/property.py
@@ -22,10 +22,9 @@ from glance.common import exception as exc
 from glance.db.sqlalchemy.metadef_api import namespace as namespace_api
 from glance.db.sqlalchemy.metadef_api import utils as metadef_utils
 from glance.db.sqlalchemy import models_metadef as models
-from glance import i18n
+from glance.i18n import _
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 
 def _get(context, property_id, session):
diff --git a/glance/db/sqlalchemy/metadef_api/tag.py b/glance/db/sqlalchemy/metadef_api/tag.py
index 1f76062546..4ec5ff84fb 100644
--- a/glance/db/sqlalchemy/metadef_api/tag.py
+++ b/glance/db/sqlalchemy/metadef_api/tag.py
@@ -23,10 +23,9 @@ from glance.common import exception as exc
 from glance.db.sqlalchemy.metadef_api import namespace as namespace_api
 import glance.db.sqlalchemy.metadef_api.utils as metadef_utils
 from glance.db.sqlalchemy import models_metadef as models
-from glance import i18n
+from glance.i18n import _LW
 
 LOG = logging.getLogger(__name__)
-_LW = i18n._LW
 
 
 def _get(context, id, session):
diff --git a/glance/db/sqlalchemy/migrate_repo/schema.py b/glance/db/sqlalchemy/migrate_repo/schema.py
index 3c0b833492..b7d93e7bd2 100644
--- a/glance/db/sqlalchemy/migrate_repo/schema.py
+++ b/glance/db/sqlalchemy/migrate_repo/schema.py
@@ -20,11 +20,10 @@ Various conveniences used for migration scripts
 from oslo_log import log as logging
 import sqlalchemy.types
 
-from glance import i18n
+from glance.i18n import _LI
 
 
 LOG = logging.getLogger(__name__)
-_LI = i18n._LI
 
 
 String = lambda length: sqlalchemy.types.String(
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
index 6b5ac87f8c..4f4298ebfb 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
@@ -19,11 +19,9 @@ import six.moves.urllib.parse as urlparse
 import sqlalchemy
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _, _LE
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
 
 
 def upgrade(migrate_engine):
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
index b7a93af59c..c0ea8f2246 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
@@ -36,13 +36,9 @@ import sqlalchemy
 
 from glance.common import crypt
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-_LW = i18n._LW
 CONF = cfg.CONF
 
 CONF.import_opt('metadata_encryption_key', 'glance.common.config')
diff --git a/glance/db/sqlalchemy/models_artifacts.py b/glance/db/sqlalchemy/models_artifacts.py
index 8af0016dc4..40244708aa 100644
--- a/glance/db/sqlalchemy/models_artifacts.py
+++ b/glance/db/sqlalchemy/models_artifacts.py
@@ -33,12 +33,10 @@ from sqlalchemy import Text
 
 import glance.artifacts as ga
 from glance.common import semver_db
-from glance import i18n
 from oslo_log import log as os_logging
 
 BASE = declarative.declarative_base()
 LOG = os_logging.getLogger(__name__)
-_LW = i18n._LW
 
 
 class ArtifactBase(models.ModelBase, models.TimestampMixin):
diff --git a/glance/domain/__init__.py b/glance/domain/__init__.py
index 5cc8321e2a..e6fa28c65f 100644
--- a/glance/domain/__init__.py
+++ b/glance/domain/__init__.py
@@ -26,12 +26,8 @@ from oslo_utils import timeutils
 import six
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-_LW = i18n._LW
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 CONF.import_opt('task_executor', 'glance.common.config', group='task')
diff --git a/glance/image_cache/__init__.py b/glance/image_cache/__init__.py
index 8425580931..d1668312a9 100644
--- a/glance/image_cache/__init__.py
+++ b/glance/image_cache/__init__.py
@@ -28,13 +28,9 @@ from oslo_utils import units
 
 from glance.common import exception
 from glance.common import utils
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-_LW = i18n._LW
 
 image_cache_opts = [
     cfg.StrOpt('image_cache_driver', default='sqlite',
diff --git a/glance/image_cache/client.py b/glance/image_cache/client.py
index 329920672e..3cf7bfaf6f 100644
--- a/glance/image_cache/client.py
+++ b/glance/image_cache/client.py
@@ -19,9 +19,7 @@ from oslo_serialization import jsonutils as json
 
 from glance.common import client as base_client
 from glance.common import exception
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 
 class CacheClient(base_client.BaseClient):
diff --git a/glance/image_cache/drivers/base.py b/glance/image_cache/drivers/base.py
index f202db4b2c..40453e2295 100644
--- a/glance/image_cache/drivers/base.py
+++ b/glance/image_cache/drivers/base.py
@@ -24,10 +24,9 @@ from oslo_log import log as logging
 
 from glance.common import exception
 from glance.common import utils
-from glance import i18n
+from glance.i18n import _
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 CONF = cfg.CONF
 
diff --git a/glance/image_cache/drivers/sqlite.py b/glance/image_cache/drivers/sqlite.py
index 1c08acb21d..e30b59efa5 100644
--- a/glance/image_cache/drivers/sqlite.py
+++ b/glance/image_cache/drivers/sqlite.py
@@ -31,14 +31,10 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 from glance.image_cache.drivers import base
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-_LW = i18n._LW
 
 sqlite_opts = [
     cfg.StrOpt('image_cache_sqlite_db', default='cache.db',
diff --git a/glance/image_cache/drivers/xattr.py b/glance/image_cache/drivers/xattr.py
index 2089aa1e4d..ed00170376 100644
--- a/glance/image_cache/drivers/xattr.py
+++ b/glance/image_cache/drivers/xattr.py
@@ -66,14 +66,10 @@ import six
 import xattr
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _, _LI, _LW
 from glance.image_cache.drivers import base
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-_LW = i18n._LW
 
 CONF = cfg.CONF
 
diff --git a/glance/image_cache/prefetcher.py b/glance/image_cache/prefetcher.py
index e502af153b..0e9070331c 100644
--- a/glance/image_cache/prefetcher.py
+++ b/glance/image_cache/prefetcher.py
@@ -23,13 +23,11 @@ from oslo_log import log as logging
 
 from glance.common import exception
 from glance import context
-from glance import i18n
+from glance.i18n import _LI, _LW
 from glance.image_cache import base
 import glance.registry.client.v1.api as registry
 
 LOG = logging.getLogger(__name__)
-_LI = i18n._LI
-_LW = i18n._LW
 
 
 class Prefetcher(base.CacheApp):
diff --git a/glance/location.py b/glance/location.py
index af451f4496..0d50c4534b 100644
--- a/glance/location.py
+++ b/glance/location.py
@@ -26,13 +26,9 @@ from glance.common import exception
 from glance.common import signature_utils
 from glance.common import utils
 import glance.domain.proxy
-from glance import i18n
+from glance.i18n import _, _LE, _LI
 
 
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
diff --git a/glance/notifier.py b/glance/notifier.py
index b992be148a..2a8ce7542a 100644
--- a/glance/notifier.py
+++ b/glance/notifier.py
@@ -28,10 +28,8 @@ import webob
 
 from glance.common import exception
 from glance.domain import proxy as domain_proxy
-from glance import i18n
+from glance.i18n import _, _LE
 
-_ = i18n._
-_LE = i18n._LE
 
 notifier_opts = [
     cfg.StrOpt('default_publisher_id', default="image.localhost",
diff --git a/glance/quota/__init__.py b/glance/quota/__init__.py
index ccc3eef363..1fc8079a7e 100644
--- a/glance/quota/__init__.py
+++ b/glance/quota/__init__.py
@@ -25,12 +25,10 @@ import glance.common.exception as exception
 from glance.common import utils
 import glance.domain
 import glance.domain.proxy
-from glance import i18n
+from glance.i18n import _, _LI
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LI = i18n._LI
 CONF = cfg.CONF
 CONF.import_opt('image_member_quota', 'glance.common.config')
 CONF.import_opt('image_property_quota', 'glance.common.config')
diff --git a/glance/registry/__init__.py b/glance/registry/__init__.py
index fce2a57248..849871ac24 100644
--- a/glance/registry/__init__.py
+++ b/glance/registry/__init__.py
@@ -19,9 +19,8 @@ Registry API
 
 from oslo_config import cfg
 
-from glance import i18n
+from glance.i18n import _
 
-_ = i18n._
 
 registry_addr_opts = [
     cfg.StrOpt('registry_host', default='0.0.0.0',
diff --git a/glance/registry/api/v1/images.py b/glance/registry/api/v1/images.py
index bc0d7c4ede..cfa01c8736 100644
--- a/glance/registry/api/v1/images.py
+++ b/glance/registry/api/v1/images.py
@@ -29,14 +29,10 @@ from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
 import glance.db
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
-_LW = i18n._LW
 
 CONF = cfg.CONF
 
diff --git a/glance/registry/api/v1/members.py b/glance/registry/api/v1/members.py
index 634fbda00e..d6383ef49a 100644
--- a/glance/registry/api/v1/members.py
+++ b/glance/registry/api/v1/members.py
@@ -21,13 +21,10 @@ from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
 import glance.db
-from glance import i18n
+from glance.i18n import _, _LI, _LW
 
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LI = i18n._LI
-_LW = i18n._LW
 
 
 class Controller(object):
diff --git a/glance/registry/api/v2/rpc.py b/glance/registry/api/v2/rpc.py
index 9bb02e395a..0049684398 100644
--- a/glance/registry/api/v2/rpc.py
+++ b/glance/registry/api/v2/rpc.py
@@ -22,9 +22,8 @@ from oslo_config import cfg
 from glance.common import rpc
 from glance.common import wsgi
 import glance.db
-from glance import i18n
+from glance.i18n import _
 
-_ = i18n._
 
 CONF = cfg.CONF
 
diff --git a/glance/registry/client/__init__.py b/glance/registry/client/__init__.py
index 9e4b99a0c0..5acecc5fe6 100644
--- a/glance/registry/client/__init__.py
+++ b/glance/registry/client/__init__.py
@@ -15,9 +15,8 @@
 
 from oslo_config import cfg
 
-from glance import i18n
+from glance.i18n import _
 
-_ = i18n._
 
 registry_client_opts = [
     cfg.StrOpt('registry_client_protocol', default='http',
diff --git a/glance/registry/client/v1/api.py b/glance/registry/client/v1/api.py
index 4ec0cf471a..51e4cee8f9 100644
--- a/glance/registry/client/v1/api.py
+++ b/glance/registry/client/v1/api.py
@@ -24,11 +24,10 @@ from oslo_log import log as logging
 from oslo_serialization import jsonutils
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _
 from glance.registry.client.v1 import client
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 registry_client_ctx_opts = [
     cfg.BoolOpt('send_identity_headers', default=False,
diff --git a/glance/registry/client/v1/client.py b/glance/registry/client/v1/client.py
index 53a0b04d86..03cd0339b5 100644
--- a/glance/registry/client/v1/client.py
+++ b/glance/registry/client/v1/client.py
@@ -24,11 +24,10 @@ from oslo_utils import excutils
 
 from glance.common.client import BaseClient
 from glance.common import crypt
-from glance import i18n
+from glance.i18n import _LE
 from glance.registry.api.v1 import images
 
 LOG = logging.getLogger(__name__)
-_LE = i18n._LE
 
 
 class RegistryClient(BaseClient):
diff --git a/glance/registry/client/v2/api.py b/glance/registry/client/v2/api.py
index 6f0c93fea0..69a8016823 100644
--- a/glance/registry/client/v2/api.py
+++ b/glance/registry/client/v2/api.py
@@ -23,11 +23,10 @@ from oslo_config import cfg
 from oslo_log import log as logging
 
 from glance.common import exception
-from glance import i18n
+from glance.i18n import _
 from glance.registry.client.v2 import client
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
 
 CONF = cfg.CONF
 _registry_client = 'glance.registry.client'
diff --git a/glance/schema.py b/glance/schema.py
index 0fb274732d..f1bf431061 100644
--- a/glance/schema.py
+++ b/glance/schema.py
@@ -18,9 +18,7 @@ from oslo_utils import encodeutils
 import six
 
 from glance.common import exception
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 
 class Schema(object):
diff --git a/glance/scrubber.py b/glance/scrubber.py
index 5125df186d..b3bc529c92 100644
--- a/glance/scrubber.py
+++ b/glance/scrubber.py
@@ -27,16 +27,11 @@ from glance.common import crypt
 from glance.common import exception
 from glance import context
 import glance.db as db_api
-from glance import i18n
+from glance.i18n import _, _LE, _LI, _LW
 import glance.registry.client.v1.api as registry
 
 LOG = logging.getLogger(__name__)
 
-_ = i18n._
-_LI = i18n._LI
-_LW = i18n._LW
-_LE = i18n._LE
-
 scrubber_opts = [
     cfg.IntOpt('scrub_time', default=0,
                help=_('The amount of time in seconds to delay before '
diff --git a/glance/tests/functional/v2/test_metadef_resourcetypes.py b/glance/tests/functional/v2/test_metadef_resourcetypes.py
index 9fd0ececc5..77cafe1ea9 100644
--- a/glance/tests/functional/v2/test_metadef_resourcetypes.py
+++ b/glance/tests/functional/v2/test_metadef_resourcetypes.py
@@ -29,14 +29,11 @@ from glance.common import exception
 from glance.common import wsgi
 import glance.db
 import glance.gateway
-from glance import i18n
+from glance.i18n import _, _LE
 import glance.notifier
 import glance.schema
 
 LOG = logging.getLogger(__name__)
-_ = i18n._
-_LE = i18n._LE
-_LI = i18n._LI
 
 
 class ResourceTypeController(object):
diff --git a/glance/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py
index 2a2a703756..023913a7d0 100644
--- a/glance/tests/unit/test_migrations.py
+++ b/glance/tests/unit/test_migrations.py
@@ -53,9 +53,7 @@ from glance.db.sqlalchemy import models
 from glance.db.sqlalchemy import models_artifacts
 from glance.db.sqlalchemy import models_metadef
 
-from glance import i18n
-
-_ = i18n._
+from glance.i18n import _
 
 CONF = cfg.CONF
 CONF.import_opt('metadata_encryption_key', 'glance.common.config')
diff --git a/glance/tests/unit/v2/test_registry_client.py b/glance/tests/unit/v2/test_registry_client.py
index ca3ec1a242..fc70f39853 100644
--- a/glance/tests/unit/v2/test_registry_client.py
+++ b/glance/tests/unit/v2/test_registry_client.py
@@ -32,15 +32,13 @@ from glance.common import config
 from glance.common import exception
 from glance import context
 from glance.db.sqlalchemy import api as db_api
-from glance import i18n
+from glance.i18n import _
 from glance.registry.api import v2 as rserver
 import glance.registry.client.v2.api as rapi
 from glance.registry.client.v2.api import client as rclient
 from glance.tests.unit import base
 from glance.tests import utils as test_utils
 
-_ = i18n._
-
 _gen_uuid = lambda: str(uuid.uuid4())
 
 UUID1 = str(uuid.uuid4())
diff --git a/tools/migrate_image_owners.py b/tools/migrate_image_owners.py
index aadf38f350..6a602b16d8 100644
--- a/tools/migrate_image_owners.py
+++ b/tools/migrate_image_owners.py
@@ -21,13 +21,9 @@ from oslo_log import log as logging
 
 import glance.context
 import glance.db.sqlalchemy.api as db_api
-from glance import i18n
+from glance.i18n import _LC, _LE, _LI
 import glance.registry.context
 
-_ = i18n._
-_LC = i18n._LC
-_LE = i18n._LE
-_LI = i18n._LI
 
 LOG = logging.getLogger(__name__)
 LOG.addHandler(logging.StreamHandler())
diff --git a/tox.ini b/tox.ini
index be1729c8ff..d40c685ef7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -154,3 +154,4 @@ exclude = .venv,.git,.tox,dist,doc,etc,*glance/locale*,*lib/python*,*egg,build
 
 [hacking]
 local-check-factory = glance.hacking.checks.factory
+import_exceptions = glance.i18n