Merge imports in code

This patch merges all lines importing i18n into 1 line:

http://docs.openstack.org/developer/hacking/#imports

Change-Id: I1f637883cbc5e0efd1bc20feb6cb672b8f92d4a0

bilean/common/exception.py

@@ -23,8 +23,7 @@ import sys
 from oslo_log import log as logging
 import six
 
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
+from bilean.common.i18n import _, _LE
 
 _FATAL_EXCEPTION_FORMAT_ERRORS = False
 LOG = logging.getLogger(__name__)

bilean/common/utils.py

@@ -32,8 +32,7 @@ from oslo_utils import strutils
 from oslo_utils import timeutils
 
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LI
+from bilean.common.i18n import _, _LI
 
 cfg.CONF.import_opt('max_response_size', 'bilean.common.config')
 LOG = logging.getLogger(__name__)

bilean/common/wsgi.py

@@ -47,10 +47,7 @@ import webob.dec
 import webob.exc
 
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
-from bilean.common.i18n import _LI
-from bilean.common.i18n import _LW
+from bilean.common.i18n import _, _LE, _LI, _LW
 from bilean.common import serializers
 
 

bilean/engine/actions/base.py

@@ -19,8 +19,7 @@ from oslo_utils import timeutils
 
 from bilean.common import context as req_context
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
+from bilean.common.i18n import _, _LE
 from bilean.common import utils
 from bilean.db import api as db_api
 from bilean.engine import event as EVENT

bilean/engine/actions/user_action.py

@@ -13,9 +13,7 @@
 import six
 
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
-from bilean.common.i18n import _LI
+from bilean.common.i18n import _, _LE, _LI
 from bilean.engine.actions import base
 from bilean.engine import event as EVENT
 from bilean.engine.flows import flow as bilean_flow

bilean/engine/environment.py

@@ -19,9 +19,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
-from bilean.common.i18n import _LI
+from bilean.common.i18n import _, _LE, _LI
 from bilean.engine import parser
 from bilean.engine import registry
 

bilean/engine/event.py

@@ -14,11 +14,7 @@
 import logging
 
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LC
-from bilean.common.i18n import _LE
-from bilean.common.i18n import _LI
-from bilean.common.i18n import _LW
+from bilean.common.i18n import _, _LC, _LE, _LI, _LW
 from bilean.common import utils
 from bilean.db import api as db_api
 

bilean/engine/lock.py

@@ -16,9 +16,7 @@ from oslo_log import log as logging
 from oslo_utils import timeutils
 import time
 
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
-from bilean.common.i18n import _LI
+from bilean.common.i18n import _, _LE, _LI
 from bilean.db import api as db_api
 
 CONF = cfg.CONF

bilean/engine/registry.py

@@ -15,8 +15,7 @@ import six
 
 from oslo_log import log as logging
 
-from bilean.common.i18n import _LI
-from bilean.common.i18n import _LW
+from bilean.common.i18n import _LI, _LW
 
 LOG = logging.getLogger(__name__)
 

bilean/engine/service.py

@@ -26,10 +26,7 @@ from oslo_utils import timeutils
 from bilean.common import consts
 from bilean.common import context as bilean_context
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
-from bilean.common.i18n import _LI
-from bilean.common.i18n import _LW
+from bilean.common.i18n import _, _LE, _LI, _LW
 from bilean.common import messaging as rpc_messaging
 from bilean.common import schema
 from bilean.common import utils

bilean/engine/user.py

@@ -15,8 +15,7 @@ import six
 import time
 
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LI
+from bilean.common.i18n import _, _LI
 from bilean.common import utils
 from bilean.db import api as db_api
 from bilean.drivers import base as driver_base

bilean/notification/action.py

@@ -12,8 +12,7 @@
 #    under the License.
 
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
+from bilean.common.i18n import _, _LE
 from bilean.rpc import client as rpc_client
 
 from oslo_log import log as logging

bilean/notification/endpoint.py

@@ -12,9 +12,7 @@
 #    under the License.
 
 from bilean.common import context
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
-from bilean.common.i18n import _LI
+from bilean.common.i18n import _, _LE, _LI
 from bilean.notification import action as notify_action
 from bilean.notification import converter
 

bilean/plugins/os/cinder/volume.py

@@ -15,8 +15,7 @@ import six
 from oslo_log import log as logging
 
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
+from bilean.common.i18n import _, _LE
 from bilean.common import schema
 from bilean.drivers import base as driver_base
 from bilean.plugins import base

bilean/plugins/os/nova/server.py

@@ -15,8 +15,7 @@ import six
 from oslo_log import log as logging
 
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LE
+from bilean.common.i18n import _, _LE
 from bilean.common import schema
 from bilean.drivers import base as driver_base
 from bilean.plugins import base

bilean/scheduler/cron_scheduler.py

@@ -13,9 +13,7 @@
 
 from bilean.common import context as bilean_context
 from bilean.common import exception
-from bilean.common.i18n import _
-from bilean.common.i18n import _LI
-from bilean.common.i18n import _LW
+from bilean.common.i18n import _, _LI, _LW
 from bilean.common import utils
 from bilean.db import api as db_api
 from bilean.engine import user as user_mod

bilean/scheduler/service.py

@@ -19,8 +19,7 @@ import oslo_messaging
 from oslo_service import service
 
 from bilean.common import consts
-from bilean.common.i18n import _LE
-from bilean.common.i18n import _LI
+from bilean.common.i18n import _LE, _LI
 from bilean.common import messaging as rpc_messaging
 from bilean.engine import user as user_mod
 from bilean.scheduler import cron_scheduler