Merge "Put all imports from manila.i18n in one line"

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

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
 

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__)

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
 

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
 
 

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

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
 

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__)
 

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__)

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__)

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
 

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

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
 from manila.scheduler import utils
 

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

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

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

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__)

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

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
 
 

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
 

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__)
 

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

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

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

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__)

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
 

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

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__)

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__)

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__)

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
 

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

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

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
 

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
 
 

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
 

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
 

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

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
 
 

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

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
 

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',