From fb44a0a49e53ebd449bcf2fd6871b3556a149463 Mon Sep 17 00:00:00 2001
From: zzxwill <zzxwill@gmail.com>
Date: Fri, 26 Aug 2016 07:18:22 -0400
Subject: [PATCH] Put all imports from manila.i18n in one line

Put '_', '_LW', '_LI', '_LE' from manila.i18n in one line
to make it beautify. Nova, neutron and many other projects
follow this rule. Like
https://github.com/openstack/nova/blob/bc5035343d366a18cae587f92ecb4e871aba974a/nova/virt/disk/mount/nbd.py
https://github.com/openstack/neutron/blob/ee42af101157426539162012a5527e1e607e033c/neutron/cmd/ipset_cleanup.py
(added more files)

Change-Id: If7ed442ebe946b32b3234ce37b38ee3a5ccbcb39
---
 manila/api/extensions.py                               | 4 +---
 manila/api/middleware/fault.py                         | 3 +--
 manila/api/openstack/__init__.py                       | 3 +--
 manila/api/openstack/wsgi.py                           | 4 +---
 manila/api/v1/security_service.py                      | 3 +--
 manila/api/v1/share_networks.py                        | 4 +---
 manila/api/v1/shares.py                                | 3 +--
 manila/api/v2/cgsnapshots.py                           | 3 +--
 manila/api/v2/consistency_groups.py                    | 3 +--
 manila/common/client_auth.py                           | 3 +--
 manila/db/sqlalchemy/api.py                            | 4 +---
 manila/network/linux/interface.py                      | 4 +---
 manila/scheduler/filters/capacity.py                   | 3 +--
 manila/scheduler/filters/driver.py                     | 3 +--
 manila/scheduler/weighers/goodness.py                  | 3 +--
 manila/service.py                                      | 5 +----
 manila/share/access.py                                 | 3 +--
 manila/share/api.py                                    | 5 +----
 manila/share/drivers/container/container_helper.py     | 3 +--
 manila/share/drivers/container/driver.py               | 4 +---
 manila/share/drivers/container/protocol_helper.py      | 3 +--
 manila/share/drivers/emc/plugins/vnx/connection.py     | 5 +----
 manila/share/drivers/emc/plugins/vnx/object_manager.py | 4 +---
 manila/share/drivers/generic.py                        | 5 +----
 manila/share/drivers/glusterfs/common.py               | 4 +---
 manila/share/drivers/glusterfs/layout_directory.py     | 3 +--
 manila/share/drivers/glusterfs/layout_volume.py        | 5 +----
 manila/share/drivers/helpers.py                        | 3 +--
 manila/share/drivers/hitachi/hnas/driver.py            | 4 +---
 manila/share/drivers/hitachi/hnas/ssh.py               | 4 +---
 manila/share/drivers/hitachi/hsp/driver.py             | 4 +---
 manila/share/drivers/hpe/hpe_3par_driver.py            | 3 +--
 manila/share/drivers/huawei/v3/connection.py           | 5 +----
 manila/share/drivers/huawei/v3/helper.py               | 4 +---
 manila/share/drivers/huawei/v3/replication.py          | 4 +---
 manila/share/drivers/lvm.py                            | 5 +----
 manila/share/drivers/quobyte/quobyte.py                | 5 +----
 manila/share/drivers/service_instance.py               | 3 +--
 manila/share/drivers/zfssa/zfssarest.py                | 4 +---
 manila/share/manager.py                                | 5 +----
 manila/share/migration.py                              | 3 +--
 manila/wsgi.py                                         | 4 +---
 42 files changed, 42 insertions(+), 117 deletions(-)

diff --git a/manila/api/extensions.py b/manila/api/extensions.py
index fe599f80c3..542979746b 100644
--- a/manila/api/extensions.py
+++ b/manila/api/extensions.py
@@ -26,9 +26,7 @@ import webob.exc
 import manila.api.openstack
 from manila.api.openstack import wsgi
 from manila import exception
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _LE, _LI, _LW
 import manila.policy
 
 CONF = cfg.CONF
diff --git a/manila/api/middleware/fault.py b/manila/api/middleware/fault.py
index d52648dbc6..ee761ac555 100644
--- a/manila/api/middleware/fault.py
+++ b/manila/api/middleware/fault.py
@@ -20,8 +20,7 @@ import webob.dec
 import webob.exc
 
 from manila.api.openstack import wsgi
-from manila.i18n import _LE
-from manila.i18n import _LI
+from manila.i18n import _LE, _LI
 from manila import utils
 from manila import wsgi as base_wsgi
 
diff --git a/manila/api/openstack/__init__.py b/manila/api/openstack/__init__.py
index 44606560a7..39ccc7091c 100644
--- a/manila/api/openstack/__init__.py
+++ b/manila/api/openstack/__init__.py
@@ -22,8 +22,7 @@ from oslo_log import log
 import routes
 
 from manila.api.openstack import wsgi
-from manila.i18n import _
-from manila.i18n import _LW
+from manila.i18n import _, _LW
 from manila import wsgi as base_wsgi
 
 LOG = log.getLogger(__name__)
diff --git a/manila/api/openstack/wsgi.py b/manila/api/openstack/wsgi.py
index abdbd3a44c..b7ba7e9ed2 100644
--- a/manila/api/openstack/wsgi.py
+++ b/manila/api/openstack/wsgi.py
@@ -29,9 +29,7 @@ from manila.api.openstack import api_version_request as api_version
 from manila.api.openstack import versioned_method
 from manila.common import constants
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
+from manila.i18n import _, _LE, _LI
 from manila import policy
 from manila import wsgi
 
diff --git a/manila/api/v1/security_service.py b/manila/api/v1/security_service.py
index 1f7681876d..ea65ae6af0 100644
--- a/manila/api/v1/security_service.py
+++ b/manila/api/v1/security_service.py
@@ -25,8 +25,7 @@ from manila.api.views import security_service as security_service_views
 from manila.common import constants
 from manila import db
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
+from manila.i18n import _, _LI
 from manila import policy
 
 
diff --git a/manila/api/v1/share_networks.py b/manila/api/v1/share_networks.py
index 906cdf854e..4abc41b4c6 100644
--- a/manila/api/v1/share_networks.py
+++ b/manila/api/v1/share_networks.py
@@ -27,9 +27,7 @@ from manila.api.openstack import wsgi
 from manila.api.views import share_networks as share_networks_views
 from manila.db import api as db_api
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LW
 from manila import policy
 from manila import quota
 from manila.share import rpcapi as share_rpcapi
diff --git a/manila/api/v1/shares.py b/manila/api/v1/shares.py
index 730e5ab90e..02afcb8733 100644
--- a/manila/api/v1/shares.py
+++ b/manila/api/v1/shares.py
@@ -32,8 +32,7 @@ from manila.api.views import share_accesses as share_access_views
 from manila.api.views import shares as share_views
 from manila import db
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
+from manila.i18n import _, _LI
 from manila import share
 from manila.share import share_types
 
diff --git a/manila/api/v2/cgsnapshots.py b/manila/api/v2/cgsnapshots.py
index f2596cf368..3178714915 100644
--- a/manila/api/v2/cgsnapshots.py
+++ b/manila/api/v2/cgsnapshots.py
@@ -27,8 +27,7 @@ import manila.api.views.cgsnapshots as cg_views
 import manila.consistency_group.api as cg_api
 from manila import db
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
+from manila.i18n import _, _LI
 
 LOG = log.getLogger(__name__)
 
diff --git a/manila/api/v2/consistency_groups.py b/manila/api/v2/consistency_groups.py
index ce1d89b158..cdb78cecf7 100644
--- a/manila/api/v2/consistency_groups.py
+++ b/manila/api/v2/consistency_groups.py
@@ -27,8 +27,7 @@ import manila.api.views.consistency_groups as cg_views
 import manila.consistency_group.api as cg_api
 from manila import db
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
+from manila.i18n import _, _LI
 from manila.share import share_types
 
 LOG = log.getLogger(__name__)
diff --git a/manila/common/client_auth.py b/manila/common/client_auth.py
index 1be7015583..5747fb47e6 100644
--- a/manila/common/client_auth.py
+++ b/manila/common/client_auth.py
@@ -21,8 +21,7 @@ from oslo_config import cfg
 from oslo_log import log
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LW
+from manila.i18n import _, _LW
 
 CONF = cfg.CONF
 LOG = log.getLogger(__name__)
diff --git a/manila/db/sqlalchemy/api.py b/manila/db/sqlalchemy/api.py
index 26f4f49d74..7f3fc26ba1 100644
--- a/manila/db/sqlalchemy/api.py
+++ b/manila/db/sqlalchemy/api.py
@@ -47,9 +47,7 @@ from sqlalchemy.sql import func
 from manila.common import constants
 from manila.db.sqlalchemy import models
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LW
 
 CONF = cfg.CONF
 
diff --git a/manila/network/linux/interface.py b/manila/network/linux/interface.py
index 2d36cd0b8c..155941969b 100644
--- a/manila/network/linux/interface.py
+++ b/manila/network/linux/interface.py
@@ -21,9 +21,7 @@ from oslo_log import log
 import six
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LW
 from manila.network.linux import ip_lib
 from manila.network.linux import ovs_lib
 from manila import utils
diff --git a/manila/scheduler/filters/capacity.py b/manila/scheduler/filters/capacity.py
index 4f694557d5..7c056e7bb6 100644
--- a/manila/scheduler/filters/capacity.py
+++ b/manila/scheduler/filters/capacity.py
@@ -21,8 +21,7 @@ import math
 
 from oslo_log import log
 
-from manila.i18n import _LE
-from manila.i18n import _LW
+from manila.i18n import _LE, _LW
 from manila.scheduler.filters import base_host
 
 LOG = log.getLogger(__name__)
diff --git a/manila/scheduler/filters/driver.py b/manila/scheduler/filters/driver.py
index 681635fd9d..3ad596d7ff 100644
--- a/manila/scheduler/filters/driver.py
+++ b/manila/scheduler/filters/driver.py
@@ -17,8 +17,7 @@ import six
 
 from oslo_log import log as logging
 
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _LI, _LW
 from manila.scheduler.evaluator import evaluator
 from manila.scheduler.filters import base_host
 from manila.scheduler import utils
diff --git a/manila/scheduler/weighers/goodness.py b/manila/scheduler/weighers/goodness.py
index 45b23c979d..839ca1aff2 100644
--- a/manila/scheduler/weighers/goodness.py
+++ b/manila/scheduler/weighers/goodness.py
@@ -16,8 +16,7 @@
 from oslo_log import log as logging
 import six
 
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _LI, _LW
 from manila.scheduler.evaluator import evaluator
 from manila.scheduler import utils
 from manila.scheduler.weighers import base_host
diff --git a/manila/service.py b/manila/service.py
index 05ab307b4d..074b690260 100644
--- a/manila/service.py
+++ b/manila/service.py
@@ -31,10 +31,7 @@ from oslo_utils import importutils
 from manila import context
 from manila import db
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LI, _LW
 from manila import rpc
 from manila import version
 from manila import wsgi
diff --git a/manila/share/access.py b/manila/share/access.py
index 00257091ed..6cbbb1b523 100644
--- a/manila/share/access.py
+++ b/manila/share/access.py
@@ -18,8 +18,7 @@ import six
 
 from manila.common import constants
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
+from manila.i18n import _, _LI
 from manila import utils
 
 LOG = log.getLogger(__name__)
diff --git a/manila/share/api.py b/manila/share/api.py
index fa6369b236..5bb2449e4b 100644
--- a/manila/share/api.py
+++ b/manila/share/api.py
@@ -32,10 +32,7 @@ from manila.common import constants
 from manila.data import rpcapi as data_rpcapi
 from manila.db import base
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LI, _LW
 from manila import policy
 from manila import quota
 from manila.scheduler import rpcapi as scheduler_rpcapi
diff --git a/manila/share/drivers/container/container_helper.py b/manila/share/drivers/container/container_helper.py
index eba03aaa11..fd3feebe25 100644
--- a/manila/share/drivers/container/container_helper.py
+++ b/manila/share/drivers/container/container_helper.py
@@ -18,8 +18,7 @@ import uuid
 from oslo_log import log
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
+from manila.i18n import _, _LI
 from manila.share import driver
 
 
diff --git a/manila/share/drivers/container/driver.py b/manila/share/drivers/container/driver.py
index 931cb08fac..abd5c9bbe4 100644
--- a/manila/share/drivers/container/driver.py
+++ b/manila/share/drivers/container/driver.py
@@ -27,9 +27,7 @@ from oslo_log import log
 from oslo_utils import importutils
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LI, _LW
 from manila.share import driver
 from manila import utils
 
diff --git a/manila/share/drivers/container/protocol_helper.py b/manila/share/drivers/container/protocol_helper.py
index 0a6e4225b6..990a95462b 100644
--- a/manila/share/drivers/container/protocol_helper.py
+++ b/manila/share/drivers/container/protocol_helper.py
@@ -19,8 +19,7 @@ from oslo_log import log
 
 from manila.common import constants as const
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LW
+from manila.i18n import _, _LW
 
 LOG = log.getLogger(__name__)
 
diff --git a/manila/share/drivers/emc/plugins/vnx/connection.py b/manila/share/drivers/emc/plugins/vnx/connection.py
index b26f563d49..38d74ae83f 100644
--- a/manila/share/drivers/emc/plugins/vnx/connection.py
+++ b/manila/share/drivers/emc/plugins/vnx/connection.py
@@ -23,10 +23,7 @@ from oslo_utils import units
 
 from manila.common import constants as const
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LI, _LW
 from manila.share.drivers.emc.plugins import base as driver
 from manila.share.drivers.emc.plugins.vnx import constants
 from manila.share.drivers.emc.plugins.vnx import object_manager as manager
diff --git a/manila/share/drivers/emc/plugins/vnx/object_manager.py b/manila/share/drivers/emc/plugins/vnx/object_manager.py
index 14e75852fd..372505ed31 100644
--- a/manila/share/drivers/emc/plugins/vnx/object_manager.py
+++ b/manila/share/drivers/emc/plugins/vnx/object_manager.py
@@ -24,9 +24,7 @@ import six
 
 from manila.common import constants as const
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LI, _LW
 from manila.share.drivers.emc.plugins.vnx import connector
 from manila.share.drivers.emc.plugins.vnx import constants
 from manila.share.drivers.emc.plugins.vnx import utils as vnx_utils
diff --git a/manila/share/drivers/generic.py b/manila/share/drivers/generic.py
index afa42d453b..b5c12ac05f 100644
--- a/manila/share/drivers/generic.py
+++ b/manila/share/drivers/generic.py
@@ -30,10 +30,7 @@ from manila.common import constants as const
 from manila import compute
 from manila import context
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LI, _LW
 from manila.share import driver
 from manila.share.drivers import service_instance
 from manila import utils
diff --git a/manila/share/drivers/glusterfs/common.py b/manila/share/drivers/glusterfs/common.py
index fc4e1340c7..0dde2fe0d1 100644
--- a/manila/share/drivers/glusterfs/common.py
+++ b/manila/share/drivers/glusterfs/common.py
@@ -24,9 +24,7 @@ from oslo_log import log
 import six
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LW
 from manila.share.drivers.ganesha import utils as ganesha_utils
 
 LOG = log.getLogger(__name__)
diff --git a/manila/share/drivers/glusterfs/layout_directory.py b/manila/share/drivers/glusterfs/layout_directory.py
index c7ba93df15..5a1279c913 100644
--- a/manila/share/drivers/glusterfs/layout_directory.py
+++ b/manila/share/drivers/glusterfs/layout_directory.py
@@ -22,8 +22,7 @@ from oslo_log import log
 import six
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
+from manila.i18n import _, _LE
 from manila.share.drivers.glusterfs import common
 from manila.share.drivers.glusterfs import layout
 
diff --git a/manila/share/drivers/glusterfs/layout_volume.py b/manila/share/drivers/glusterfs/layout_volume.py
index b56d87668e..b2132c318c 100644
--- a/manila/share/drivers/glusterfs/layout_volume.py
+++ b/manila/share/drivers/glusterfs/layout_volume.py
@@ -28,10 +28,7 @@ from oslo_log import log
 import six
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LI, _LW
 from manila.share.drivers.glusterfs import common
 from manila.share.drivers.glusterfs import layout
 from manila import utils
diff --git a/manila/share/drivers/helpers.py b/manila/share/drivers/helpers.py
index 7cdedc40d0..4789482928 100644
--- a/manila/share/drivers/helpers.py
+++ b/manila/share/drivers/helpers.py
@@ -20,8 +20,7 @@ from oslo_log import log
 
 from manila.common import constants as const
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LW
+from manila.i18n import _, _LW
 from manila import utils
 
 LOG = log.getLogger(__name__)
diff --git a/manila/share/drivers/hitachi/hnas/driver.py b/manila/share/drivers/hitachi/hnas/driver.py
index fd0a9926cc..7547930ff2 100644
--- a/manila/share/drivers/hitachi/hnas/driver.py
+++ b/manila/share/drivers/hitachi/hnas/driver.py
@@ -23,9 +23,7 @@ import six
 
 from manila.common import constants
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LI, _LW
 from manila.share import driver
 
 LOG = log.getLogger(__name__)
diff --git a/manila/share/drivers/hitachi/hnas/ssh.py b/manila/share/drivers/hitachi/hnas/ssh.py
index 36c49c61cb..97bcf9e9a1 100644
--- a/manila/share/drivers/hitachi/hnas/ssh.py
+++ b/manila/share/drivers/hitachi/hnas/ssh.py
@@ -23,9 +23,7 @@ import six
 import time
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LW
 from manila import utils as mutils
 
 LOG = log.getLogger(__name__)
diff --git a/manila/share/drivers/hitachi/hsp/driver.py b/manila/share/drivers/hitachi/hsp/driver.py
index 45ab824e8a..1db5cb380c 100644
--- a/manila/share/drivers/hitachi/hsp/driver.py
+++ b/manila/share/drivers/hitachi/hsp/driver.py
@@ -20,9 +20,7 @@ from oslo_utils import units
 
 from manila.common import constants
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
+from manila.i18n import _, _LE, _LI
 from manila.share import driver
 from manila.share.drivers.hitachi.hsp import rest
 
diff --git a/manila/share/drivers/hpe/hpe_3par_driver.py b/manila/share/drivers/hpe/hpe_3par_driver.py
index a936ffa4df..b00829e900 100644
--- a/manila/share/drivers/hpe/hpe_3par_driver.py
+++ b/manila/share/drivers/hpe/hpe_3par_driver.py
@@ -27,8 +27,7 @@ import six
 
 from manila.common import config
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LI
+from manila.i18n import _, _LI
 from manila.share import driver
 from manila.share.drivers.hpe import hpe_3par_mediator
 from manila.share import share_types
diff --git a/manila/share/drivers/huawei/v3/connection.py b/manila/share/drivers/huawei/v3/connection.py
index 5bf42d325d..e36ac84a5c 100644
--- a/manila/share/drivers/huawei/v3/connection.py
+++ b/manila/share/drivers/huawei/v3/connection.py
@@ -31,10 +31,7 @@ import six
 from manila.common import constants as common_constants
 from manila.data import utils as data_utils
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LI, _LW
 from manila import rpc
 from manila.share.drivers.huawei import base as driver
 from manila.share.drivers.huawei import constants
diff --git a/manila/share/drivers/huawei/v3/helper.py b/manila/share/drivers/huawei/v3/helper.py
index 847300bff8..05e6febc41 100644
--- a/manila/share/drivers/huawei/v3/helper.py
+++ b/manila/share/drivers/huawei/v3/helper.py
@@ -25,9 +25,7 @@ from six.moves import http_cookiejar
 from six.moves.urllib import request as urlreq  # pylint: disable=E0611
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LW
 from manila.share.drivers.huawei import constants
 from manila import utils
 
diff --git a/manila/share/drivers/huawei/v3/replication.py b/manila/share/drivers/huawei/v3/replication.py
index 98067f6b2c..be1ece98dc 100644
--- a/manila/share/drivers/huawei/v3/replication.py
+++ b/manila/share/drivers/huawei/v3/replication.py
@@ -18,9 +18,7 @@ from oslo_utils import strutils
 
 from manila.common import constants as common_constants
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LW
 from manila.share.drivers.huawei import constants
 
 
diff --git a/manila/share/drivers/lvm.py b/manila/share/drivers/lvm.py
index d05b603588..cb14a490c5 100644
--- a/manila/share/drivers/lvm.py
+++ b/manila/share/drivers/lvm.py
@@ -28,10 +28,7 @@ from oslo_utils import importutils
 import six
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LI, _LW
 from manila.share import driver
 from manila.share.drivers import generic
 
diff --git a/manila/share/drivers/quobyte/quobyte.py b/manila/share/drivers/quobyte/quobyte.py
index 11b7500dd3..34a3158ec4 100644
--- a/manila/share/drivers/quobyte/quobyte.py
+++ b/manila/share/drivers/quobyte/quobyte.py
@@ -29,10 +29,7 @@ import six
 
 from manila.common import constants
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LI, _LW
 from manila.share import driver
 from manila.share.drivers.quobyte import jsonrpc
 
diff --git a/manila/share/drivers/service_instance.py b/manila/share/drivers/service_instance.py
index f17ad6e2c5..3fd3b0ba3d 100644
--- a/manila/share/drivers/service_instance.py
+++ b/manila/share/drivers/service_instance.py
@@ -32,8 +32,7 @@ from manila.common import constants as const
 from manila import compute
 from manila import context
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LW
+from manila.i18n import _, _LW
 from manila.network.linux import ip_lib
 from manila.network.neutron import api as neutron
 from manila import utils
diff --git a/manila/share/drivers/zfssa/zfssarest.py b/manila/share/drivers/zfssa/zfssarest.py
index 6ea2509c1c..4bb4473e78 100644
--- a/manila/share/drivers/zfssa/zfssarest.py
+++ b/manila/share/drivers/zfssa/zfssarest.py
@@ -18,9 +18,7 @@ from oslo_log import log
 from oslo_serialization import jsonutils
 
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LW
 from manila.share.drivers.zfssa import restclient
 
 
diff --git a/manila/share/manager.py b/manila/share/manager.py
index e4c90625ef..12b704eb37 100644
--- a/manila/share/manager.py
+++ b/manila/share/manager.py
@@ -37,10 +37,7 @@ from manila.common import constants
 from manila import context
 from manila.data import rpcapi as data_rpcapi
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
-from manila.i18n import _LW
+from manila.i18n import _, _LE, _LI, _LW
 from manila import manager
 from manila import quota
 from manila.share import access
diff --git a/manila/share/migration.py b/manila/share/migration.py
index e3b7d04ae6..67bbae49c2 100644
--- a/manila/share/migration.py
+++ b/manila/share/migration.py
@@ -21,8 +21,7 @@ from oslo_log import log
 
 from manila.common import constants
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LW
+from manila.i18n import _, _LW
 from manila.share import api as share_api
 import manila.utils as utils
 
diff --git a/manila/wsgi.py b/manila/wsgi.py
index b45f0eced4..b9a9db49c9 100644
--- a/manila/wsgi.py
+++ b/manila/wsgi.py
@@ -41,9 +41,7 @@ import webob.exc
 
 from manila.common import config
 from manila import exception
-from manila.i18n import _
-from manila.i18n import _LE
-from manila.i18n import _LI
+from manila.i18n import _, _LE, _LI
 
 socket_opts = [
     cfg.IntOpt('backlog',