From c85809a2c58208ff2cae90bda1c97e7d1fb9db24 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Hoai Date: Sat, 27 Aug 2016 10:55:54 +0700 Subject: [PATCH] Clean imports in code This patch merges all lines importing i18n into 1 line. This will become more beautiful. There are many other project is like that: https://github.com/openstack/glance/blob/b9de463ee8c37c27e834a219367732b2177411a9/glance/registry/api/v1/images.py#L32 Change-Id: Ie347b4851927de40a0a0cf8a6f6392102f90aecf --- senlin/api/common/wsgi.py | 5 +---- senlin/engine/environment.py | 4 +--- senlin/engine/health_manager.py | 3 +-- senlin/engine/registry.py | 3 +-- senlin/engine/senlin_lock.py | 4 +--- senlin/engine/service.py | 4 +--- senlin/profiles/base.py | 4 +--- 7 files changed, 7 insertions(+), 20 deletions(-) diff --git a/senlin/api/common/wsgi.py b/senlin/api/common/wsgi.py index 4b9938763..004353c8a 100644 --- a/senlin/api/common/wsgi.py +++ b/senlin/api/common/wsgi.py @@ -41,10 +41,7 @@ from senlin.api.common import serializers from senlin.api.common import version_request from senlin.api.common import versioned_method from senlin.common import exception -from senlin.common.i18n import _ -from senlin.common.i18n import _LE -from senlin.common.i18n import _LI -from senlin.common.i18n import _LW +from senlin.common.i18n import _, _LE, _LI, _LW from senlin.rpc import client as rpc_client diff --git a/senlin/engine/environment.py b/senlin/engine/environment.py index b92c7a418..6669b9652 100644 --- a/senlin/engine/environment.py +++ b/senlin/engine/environment.py @@ -19,9 +19,7 @@ from oslo_config import cfg from oslo_log import log as logging from senlin.common import exception -from senlin.common.i18n import _ -from senlin.common.i18n import _LE -from senlin.common.i18n import _LI +from senlin.common.i18n import _, _LE, _LI from senlin.engine import parser from senlin.engine import registry diff --git a/senlin/engine/health_manager.py b/senlin/engine/health_manager.py index 07eb59f0c..cf2a4eebd 100644 --- a/senlin/engine/health_manager.py +++ b/senlin/engine/health_manager.py @@ -25,8 +25,7 @@ from oslo_service import threadgroup from senlin.common import consts from senlin.common import context -from senlin.common.i18n import _LI -from senlin.common.i18n import _LW +from senlin.common.i18n import _LI, _LW from senlin.common import messaging as rpc from senlin import objects from senlin.rpc import client as rpc_client diff --git a/senlin/engine/registry.py b/senlin/engine/registry.py index 579533fd5..15ef0566a 100644 --- a/senlin/engine/registry.py +++ b/senlin/engine/registry.py @@ -14,8 +14,7 @@ import itertools from oslo_log import log as logging -from senlin.common.i18n import _LI -from senlin.common.i18n import _LW +from senlin.common.i18n import _LI, _LW LOG = logging.getLogger(__name__) diff --git a/senlin/engine/senlin_lock.py b/senlin/engine/senlin_lock.py index d351d3bdf..a4935a010 100644 --- a/senlin/engine/senlin_lock.py +++ b/senlin/engine/senlin_lock.py @@ -15,9 +15,7 @@ from oslo_log import log as logging from oslo_utils import timeutils import time -from senlin.common.i18n import _ -from senlin.common.i18n import _LE -from senlin.common.i18n import _LI +from senlin.common.i18n import _, _LE, _LI from senlin.engine import scheduler from senlin.objects import action as ao from senlin.objects import cluster_lock as cl_obj diff --git a/senlin/engine/service.py b/senlin/engine/service.py index 68ab0e72e..87c740d3e 100644 --- a/senlin/engine/service.py +++ b/senlin/engine/service.py @@ -24,9 +24,7 @@ import six from senlin.common import consts from senlin.common import context as senlin_context from senlin.common import exception -from senlin.common.i18n import _ -from senlin.common.i18n import _LE -from senlin.common.i18n import _LI +from senlin.common.i18n import _, _LE, _LI from senlin.common import messaging as rpc_messaging from senlin.common import scaleutils as su from senlin.common import schema diff --git a/senlin/profiles/base.py b/senlin/profiles/base.py index e17a87852..996a58123 100644 --- a/senlin/profiles/base.py +++ b/senlin/profiles/base.py @@ -20,9 +20,7 @@ import six from senlin.common import consts from senlin.common import context from senlin.common import exception -from senlin.common.i18n import _ -from senlin.common.i18n import _LE -from senlin.common.i18n import _LW +from senlin.common.i18n import _, _LE, _LW from senlin.common import schema from senlin.common import utils from senlin.engine import environment