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
bc5035343d/nova/virt/disk/mount/nbd.py
ee42af1011/neutron/cmd/ipset_cleanup.py
(added more files)

Change-Id: If7ed442ebe946b32b3234ce37b38ee3a5ccbcb39
This commit is contained in:
zzxwill 2016-08-26 07:18:22 -04:00
parent 7a16eb685b
commit fb44a0a49e
42 changed files with 42 additions and 117 deletions

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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