openstack
/
ironic
Code Issues Proposed changes

Merge imports in code 

This patch merges all lines importing i18n into 1 line:

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

Change-Id: I828542a62cc577065f3bef9223d25cfe7a939785
This commit is contained in:
Nguyen Hung Phuong 2016-08-19 10:59:35 +07:00
parent 7b3f3ec2f8
commit 7022b5fad5
57 changed files with 57 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/api/middleware/parsable_error.py
View File

@ -27,8 +27,7 @@ from oslo_log import log
import six
import webob
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
LOG = log.getLogger(__name__)

3
ironic/common/driver_factory.py
View File

@ -20,8 +20,7 @@ from oslo_log import log
from stevedore import dispatch
from ironic.common import exception
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _LI, _LW
from ironic.conf import CONF
from ironic.drivers import base as driver_base

3
ironic/common/exception.py
View File

@ -24,8 +24,7 @@ from oslo_log import log as logging
import six
from six.moves import http_client
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.conf import CONF
LOG = logging.getLogger(__name__)

3
ironic/common/images.py
View File

@ -31,8 +31,7 @@ from oslo_utils import fileutils
from ironic.common import exception
from ironic.common.glance_service import service_utils as glance_utils
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.common import image_service as service
from ironic.common import utils
from ironic.conf import CONF

3
ironic/common/keystone.py
View File

@ -21,8 +21,7 @@ import six
from six.moves.urllib import parse # for legacy options loading only
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.conf import auth as ironic_auth
from ironic.conf import CONF

5
ironic/common/neutron.py
View File

@ -15,10 +15,7 @@ from neutronclient.v2_0 import client as clientv20
from oslo_log import log
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LI, _LW
from ironic.common import keystone
from ironic.conf import CONF

4
ironic/common/service.py
View File

@ -27,9 +27,7 @@ from ironic.api import app
from ironic.common import config
from ironic.common import context
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _, _LE, _LI
from ironic.common import rpc
from ironic.conf import CONF
from ironic import objects

4
ironic/common/utils.py
View File

@ -37,9 +37,7 @@ import pytz
import six
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.conf import CONF
LOG = logging.getLogger(__name__)

6
ironic/conductor/base_manager.py
View File

@ -27,11 +27,7 @@ from ironic.common import context as ironic_context
from ironic.common import driver_factory
from ironic.common import exception
from ironic.common import hash_ring as hash
from ironic.common.i18n import _
from ironic.common.i18n import _LC
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LC, _LE, _LI, _LW
from ironic.common import rpc
from ironic.common import states
from ironic.conductor import task_manager

5
ironic/conductor/manager.py
View File

@ -56,10 +56,7 @@ from ironic.common import dhcp_factory
from ironic.common import driver_factory
from ironic.common import exception
from ironic.common.glance_service import service_utils as glance_utils
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LI, _LW
from ironic.common import images
from ironic.common import states
from ironic.common import swift

4
ironic/conductor/task_manager.py
View File

@ -104,9 +104,7 @@ import six
from ironic.common import driver_factory
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import states
from ironic import objects

5
ironic/conductor/utils.py
View File

@ -16,10 +16,7 @@ from oslo_log import log
from oslo_utils import excutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LI, _LW
from ironic.common import states
from ironic.conductor import task_manager

3
ironic/db/sqlalchemy/api.py
View File

@ -33,8 +33,7 @@ from sqlalchemy.orm import joinedload
from sqlalchemy import sql
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LW
from ironic.common import states
from ironic.common import utils
from ironic.db import api

4
ironic/dhcp/neutron.py
View File

@ -21,9 +21,7 @@ from oslo_log import log as logging
from oslo_utils import netutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import network
from ironic.common import neutron
from ironic.conf import CONF

5
ironic/drivers/modules/agent.py
View File

@ -21,10 +21,7 @@ import six.moves.urllib_parse as urlparse
from ironic.common import dhcp_factory
from ironic.common import exception
from ironic.common.glance_service import service_utils
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LI, _LW
from ironic.common import image_service
from ironic.common import images
from ironic.common import raid

5
ironic/drivers/modules/agent_base_vendor.py
View File

@ -29,10 +29,7 @@ import retrying
from ironic.api.controllers.v1 import ramdisk
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LI, _LW
from ironic.common import states
from ironic.common import utils
from ironic.conductor import rpcapi

4
ironic/drivers/modules/agent_client.py
View File

@ -18,9 +18,7 @@ from oslo_serialization import jsonutils
import requests
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.conf import CONF
LOG = log.getLogger(__name__)

3
ironic/drivers/modules/amt/common.py
View File

@ -24,8 +24,7 @@ import six
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.common import utils

4
ironic/drivers/modules/amt/management.py
View File

@ -21,9 +21,7 @@ from oslo_utils import excutils
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _, _LE, _LI
from ironic.conductor import task_manager
from ironic.drivers import base
from ironic.drivers.modules.amt import common as amt_common

5
ironic/drivers/modules/amt/power.py
View File

@ -23,10 +23,7 @@ from oslo_utils import excutils
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LI, _LW
from ironic.common import states
from ironic.conductor import task_manager
from ironic.drivers import base

4
ironic/drivers/modules/console_utils.py
View File

@ -32,9 +32,7 @@ from oslo_service import loopingcall
from oslo_utils import netutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import utils
from ironic.conf import CONF

4
ironic/drivers/modules/deploy_utils.py
View File

@ -31,9 +31,7 @@ from six.moves.urllib import parse
from ironic.common import dhcp_factory
from ironic.common import exception
from ironic.common.glance_service import service_utils
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import image_service
from ironic.common import keystone
from ironic.common import states

3
ironic/drivers/modules/drac/job.py
View File

@ -19,8 +19,7 @@ from oslo_log import log as logging
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.drivers.modules.drac import common as drac_common
drac_exceptions = importutils.try_import('dracclient.exceptions')

3
ironic/drivers/modules/drac/management.py
View File

@ -24,8 +24,7 @@ from oslo_utils import importutils
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.conductor import task_manager
from ironic.drivers import base
from ironic.drivers.modules.drac import common as drac_common

3
ironic/drivers/modules/iboot.py
View File

@ -26,8 +26,7 @@ from oslo_service import loopingcall
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LW
from ironic.common import states
from ironic.common import utils
from ironic.conductor import task_manager

4
ironic/drivers/modules/ilo/boot.py
View File

@ -27,9 +27,7 @@ import six.moves.urllib.parse as urlparse
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.glance_service import service_utils
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import image_service
from ironic.common import images
from ironic.common import states

5
ironic/drivers/modules/ilo/common.py
View File

@ -30,10 +30,7 @@ from six.moves.urllib.parse import urljoin
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.glance_service import service_utils
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LI, _LW
from ironic.common import images
from ironic.common import swift
from ironic.common import utils

3
ironic/drivers/modules/ilo/deploy.py
View File

@ -20,8 +20,7 @@ from oslo_log import log as logging
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.glance_service import service_utils
from ironic.common.i18n import _
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LW
from ironic.common import image_service
from ironic.common import states
from ironic.conductor import task_manager

4
ironic/drivers/modules/ilo/inspect.py
View File

@ -16,9 +16,7 @@ from oslo_log import log as logging
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LI, _LW
from ironic.common import states
from ironic.common import utils
from ironic.conductor import utils as conductor_utils

3
ironic/drivers/modules/ilo/power.py
View File

@ -22,8 +22,7 @@ from oslo_utils import importutils
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.common import states
from ironic.conductor import task_manager
from ironic.conductor import utils as manager_utils

3
ironic/drivers/modules/image_cache.py
View File

@ -30,8 +30,7 @@ import six
from ironic.common import exception
from ironic.common.glance_service import service_utils
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _LI, _LW
from ironic.common import image_service
from ironic.common import images
from ironic.common import utils

4
ironic/drivers/modules/inspector.py
View File

@ -21,9 +21,7 @@ from oslo_log import log as logging
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _, _LE, _LI
from ironic.common import keystone
from ironic.common import states
from ironic.conductor import task_manager

4
ironic/drivers/modules/ipminative.py
View File

@ -29,9 +29,7 @@ from oslo_utils import strutils
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import states
from ironic.common import utils
from ironic.conductor import task_manager

5
ironic/drivers/modules/ipmitool.py
View File

@ -48,10 +48,7 @@ import six
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LI, _LW
from ironic.common import states
from ironic.common import utils
from ironic.conductor import task_manager

4
ironic/drivers/modules/irmc/boot.py
View File

@ -27,9 +27,7 @@ from oslo_utils import importutils
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.glance_service import service_utils
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _, _LE, _LI
from ironic.common import images
from ironic.common import states
from ironic.conductor import utils as manager_utils

4
ironic/drivers/modules/irmc/inspect.py
View File

@ -19,9 +19,7 @@ from oslo_log import log as logging
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LI, _LW
from ironic.common import states
from ironic.drivers import base
from ironic.drivers.modules.irmc import common as irmc_common

3
ironic/drivers/modules/irmc/management.py
View File

@ -20,8 +20,7 @@ from oslo_utils import importutils
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.conductor import task_manager
from ironic.drivers.modules import ipmitool
from ironic.drivers.modules.irmc import common as irmc_common

3
ironic/drivers/modules/irmc/power.py
View File

@ -19,8 +19,7 @@ from oslo_log import log as logging
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.common import states
from ironic.conductor import task_manager
from ironic.drivers import base

3
ironic/drivers/modules/msftocs/msftocsclient.py
View File

@ -27,8 +27,7 @@ from requests import auth
from requests import exceptions as requests_exceptions
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
LOG = log.getLogger(__name__)

3
ironic/drivers/modules/msftocs/power.py
View File

@ -19,8 +19,7 @@ MSFT OCS Power Driver
from oslo_log import log
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.common import states
from ironic.conductor import task_manager
from ironic.drivers import base

4
ironic/drivers/modules/network/flat.py
View File

@ -19,9 +19,7 @@ from oslo_log import log
from oslo_utils import uuidutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LI, _LW
from ironic.common import neutron
from ironic.drivers import base

4
ironic/drivers/modules/network/neutron.py
View File

@ -20,9 +20,7 @@ from oslo_log import log
from oslo_utils import uuidutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LI, _LW
from ironic.common import neutron
from ironic.drivers import base
from ironic import objects

3
ironic/drivers/modules/oneview/common.py
View File

@ -17,8 +17,7 @@ from oslo_log import log as logging
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.common import states
from ironic.conf import CONF
from ironic.drivers import utils

3
ironic/drivers/modules/oneview/deploy.py
View File

@ -21,8 +21,7 @@ from oslo_log import log as logging
import six
from ironic.common import exception
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LE, _LI
from ironic.common import states
from ironic.drivers.modules import agent
from ironic.drivers.modules import iscsi_deploy

5
ironic/drivers/modules/oneview/deploy_utils.py
View File

@ -18,10 +18,7 @@ from oslo_log import log as logging
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LI, _LW
from ironic.common import states
from ironic.drivers.modules.oneview import common

3
ironic/drivers/modules/oneview/power.py
View File

@ -18,8 +18,7 @@ from oslo_log import log as logging
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.common import states
from ironic.conductor import task_manager
from ironic.drivers import base

4
ironic/drivers/modules/oneview/vendor.py
View File

@ -17,9 +17,7 @@
from oslo_log import log
import retrying
from ironic.common.i18n import _
from ironic.common.i18n import _LI
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LI, _LW
from ironic.common import states
from ironic.conductor import utils as manager_utils
from ironic.drivers.modules import agent

4
ironic/drivers/modules/pxe.py
View File

@ -28,9 +28,7 @@ from ironic.common import boot_devices
from ironic.common import dhcp_factory
from ironic.common import exception
from ironic.common.glance_service import service_utils
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import image_service as service
from ironic.common import pxe_utils
from ironic.common import states

4
ironic/drivers/modules/seamicro.py
View File

@ -28,9 +28,7 @@ from six.moves.urllib import parse as urlparse
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import states
from ironic.common import utils
from ironic.conductor import task_manager

3
ironic/drivers/modules/snmp.py
View File

@ -36,8 +36,7 @@ from oslo_utils import importutils
import six
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LW
from ironic.common import states
from ironic.common import utils
from ironic.conductor import task_manager

4
ironic/drivers/modules/ssh.py
View File

@ -39,9 +39,7 @@ import retrying
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import states
from ironic.common import utils
from ironic.conductor import task_manager

3
ironic/drivers/modules/ucs/helper.py
View File

@ -21,8 +21,7 @@ from oslo_utils import importutils
import six
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.drivers.modules import deploy_utils
ucs_helper = importutils.try_import('UcsSdk.utils.helper')

3
ironic/drivers/modules/ucs/management.py
View File

@ -23,8 +23,7 @@ from oslo_utils import importutils
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.drivers import base
from ironic.drivers.modules.ucs import helper as ucs_helper

3
ironic/drivers/modules/ucs/power.py
View File

@ -22,8 +22,7 @@ from oslo_service import loopingcall
from oslo_utils import importutils
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _, _LE
from ironic.common import states
from ironic.conductor import task_manager
from ironic.conf import CONF

4
ironic/drivers/modules/virtualbox.py
View File

@ -19,9 +19,7 @@ from oslo_utils import importutils
from ironic.common import boot_devices
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import states
from ironic.common import utils
from ironic.conductor import task_manager

3
ironic/drivers/modules/wol.py
View File

@ -24,8 +24,7 @@ import time
from oslo_log import log
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LI
from ironic.common.i18n import _, _LI
from ironic.common import states
from ironic.common import utils
from ironic.conductor import task_manager

4
ironic/drivers/utils.py
View File

@ -22,9 +22,7 @@ from oslo_utils import timeutils
import six
from ironic.common import exception
from ironic.common.i18n import _
from ironic.common.i18n import _LE
from ironic.common.i18n import _LW
from ironic.common.i18n import _, _LE, _LW
from ironic.common import swift
from ironic.conductor import utils
from ironic.drivers import base