Merge imports in code

This patch merges all lines importing i18n into 1 line:

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

Change-Id: I828542a62cc577065f3bef9223d25cfe7a939785

43 files changed, 43 insertions, 116 deletions

diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py
index d54537021..1b045974c 100644
--- a/ironic/drivers/modules/agent.py
+++ b/ironic/drivers/modules/agent.py
@@ -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
diff --git a/ironic/drivers/modules/agent_base_vendor.py b/ironic/drivers/modules/agent_base_vendor.py
index f6da43a72..0d8afd7b0 100644
--- a/ironic/drivers/modules/agent_base_vendor.py
+++ b/ironic/drivers/modules/agent_base_vendor.py
@@ -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
diff --git a/ironic/drivers/modules/agent_client.py b/ironic/drivers/modules/agent_client.py
index c8a82f19f..7e0d92a93 100644
--- a/ironic/drivers/modules/agent_client.py
+++ b/ironic/drivers/modules/agent_client.py
@@ -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__)
diff --git a/ironic/drivers/modules/amt/common.py b/ironic/drivers/modules/amt/common.py
index 831c1b0b3..03f06a0ff 100644
--- a/ironic/drivers/modules/amt/common.py
+++ b/ironic/drivers/modules/amt/common.py
@@ -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
 
 
diff --git a/ironic/drivers/modules/amt/management.py b/ironic/drivers/modules/amt/management.py
index bcc31b4da..d41d43cda 100644
--- a/ironic/drivers/modules/amt/management.py
+++ b/ironic/drivers/modules/amt/management.py
@@ -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
diff --git a/ironic/drivers/modules/amt/power.py b/ironic/drivers/modules/amt/power.py
index d74a95671..8106c0d9a 100644
--- a/ironic/drivers/modules/amt/power.py
+++ b/ironic/drivers/modules/amt/power.py
@@ -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
diff --git a/ironic/drivers/modules/console_utils.py b/ironic/drivers/modules/console_utils.py
index 799231232..ffb22537f 100644
--- a/ironic/drivers/modules/console_utils.py
+++ b/ironic/drivers/modules/console_utils.py
@@ -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
 
diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py
index 9b5dc0c71..e197ef869 100644
--- a/ironic/drivers/modules/deploy_utils.py
+++ b/ironic/drivers/modules/deploy_utils.py
@@ -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
diff --git a/ironic/drivers/modules/drac/job.py b/ironic/drivers/modules/drac/job.py
index e7cf94c30..c8086d74f 100644
--- a/ironic/drivers/modules/drac/job.py
+++ b/ironic/drivers/modules/drac/job.py
@@ -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')
diff --git a/ironic/drivers/modules/drac/management.py b/ironic/drivers/modules/drac/management.py
index 1799f1a07..f1159ae1b 100644
--- a/ironic/drivers/modules/drac/management.py
+++ b/ironic/drivers/modules/drac/management.py
@@ -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
diff --git a/ironic/drivers/modules/iboot.py b/ironic/drivers/modules/iboot.py
index 3b9c1cbe4..d01faf590 100644
--- a/ironic/drivers/modules/iboot.py
+++ b/ironic/drivers/modules/iboot.py
@@ -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
diff --git a/ironic/drivers/modules/ilo/boot.py b/ironic/drivers/modules/ilo/boot.py
index 1a5c5dae4..7df57cd4a 100644
--- a/ironic/drivers/modules/ilo/boot.py
+++ b/ironic/drivers/modules/ilo/boot.py
@@ -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
diff --git a/ironic/drivers/modules/ilo/common.py b/ironic/drivers/modules/ilo/common.py
index b22e32ece..269c0d56a 100644
--- a/ironic/drivers/modules/ilo/common.py
+++ b/ironic/drivers/modules/ilo/common.py
@@ -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
diff --git a/ironic/drivers/modules/ilo/deploy.py b/ironic/drivers/modules/ilo/deploy.py
index 3e6213abd..942f2f5e0 100644
--- a/ironic/drivers/modules/ilo/deploy.py
+++ b/ironic/drivers/modules/ilo/deploy.py
@@ -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
diff --git a/ironic/drivers/modules/ilo/inspect.py b/ironic/drivers/modules/ilo/inspect.py
index 9ff7a4b79..e7571816e 100644
--- a/ironic/drivers/modules/ilo/inspect.py
+++ b/ironic/drivers/modules/ilo/inspect.py
@@ -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
diff --git a/ironic/drivers/modules/ilo/power.py b/ironic/drivers/modules/ilo/power.py
index 53cd4082c..9c13e6648 100644
--- a/ironic/drivers/modules/ilo/power.py
+++ b/ironic/drivers/modules/ilo/power.py
@@ -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
diff --git a/ironic/drivers/modules/image_cache.py b/ironic/drivers/modules/image_cache.py
index 533ce7583..541cce440 100644
--- a/ironic/drivers/modules/image_cache.py
+++ b/ironic/drivers/modules/image_cache.py
@@ -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
diff --git a/ironic/drivers/modules/inspector.py b/ironic/drivers/modules/inspector.py
index 59c5a3157..66c7833f3 100644
--- a/ironic/drivers/modules/inspector.py
+++ b/ironic/drivers/modules/inspector.py
@@ -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
diff --git a/ironic/drivers/modules/ipminative.py b/ironic/drivers/modules/ipminative.py
index 45471f880..a91a85b01 100644
--- a/ironic/drivers/modules/ipminative.py
+++ b/ironic/drivers/modules/ipminative.py
@@ -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
diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py
index 950cd06be..6a8d5d4e9 100644
--- a/ironic/drivers/modules/ipmitool.py
+++ b/ironic/drivers/modules/ipmitool.py
@@ -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
diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py
index c4bc59473..c1d53bf24 100644
--- a/ironic/drivers/modules/irmc/boot.py
+++ b/ironic/drivers/modules/irmc/boot.py
@@ -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
diff --git a/ironic/drivers/modules/irmc/inspect.py b/ironic/drivers/modules/irmc/inspect.py
index a700e38ae..91ef22025 100644
--- a/ironic/drivers/modules/irmc/inspect.py
+++ b/ironic/drivers/modules/irmc/inspect.py
@@ -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
diff --git a/ironic/drivers/modules/irmc/management.py b/ironic/drivers/modules/irmc/management.py
index c46cfd10c..b56e99433 100644
--- a/ironic/drivers/modules/irmc/management.py
+++ b/ironic/drivers/modules/irmc/management.py
@@ -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
diff --git a/ironic/drivers/modules/irmc/power.py b/ironic/drivers/modules/irmc/power.py
index cdf2eafc3..5966b8ce6 100644
--- a/ironic/drivers/modules/irmc/power.py
+++ b/ironic/drivers/modules/irmc/power.py
@@ -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
diff --git a/ironic/drivers/modules/msftocs/msftocsclient.py b/ironic/drivers/modules/msftocs/msftocsclient.py
index 3c7d75829..d511c68ad 100644
--- a/ironic/drivers/modules/msftocs/msftocsclient.py
+++ b/ironic/drivers/modules/msftocs/msftocsclient.py
@@ -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__)
 
diff --git a/ironic/drivers/modules/msftocs/power.py b/ironic/drivers/modules/msftocs/power.py
index c04ae8116..e5ce62066 100644
--- a/ironic/drivers/modules/msftocs/power.py
+++ b/ironic/drivers/modules/msftocs/power.py
@@ -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
diff --git a/ironic/drivers/modules/network/flat.py b/ironic/drivers/modules/network/flat.py
index 591c4e8df..ff3c54006 100644
--- a/ironic/drivers/modules/network/flat.py
+++ b/ironic/drivers/modules/network/flat.py
@@ -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
 
diff --git a/ironic/drivers/modules/network/neutron.py b/ironic/drivers/modules/network/neutron.py
index 7db4fd4ff..82bbece2d 100644
--- a/ironic/drivers/modules/network/neutron.py
+++ b/ironic/drivers/modules/network/neutron.py
@@ -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
diff --git a/ironic/drivers/modules/oneview/common.py b/ironic/drivers/modules/oneview/common.py
index 7114a5cd3..b3d40b58a 100644
--- a/ironic/drivers/modules/oneview/common.py
+++ b/ironic/drivers/modules/oneview/common.py
@@ -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
diff --git a/ironic/drivers/modules/oneview/deploy.py b/ironic/drivers/modules/oneview/deploy.py
index 455e6e27e..19262ca4c 100644
--- a/ironic/drivers/modules/oneview/deploy.py
+++ b/ironic/drivers/modules/oneview/deploy.py
@@ -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
diff --git a/ironic/drivers/modules/oneview/deploy_utils.py b/ironic/drivers/modules/oneview/deploy_utils.py
index 6138fb6de..b96f9885b 100644
--- a/ironic/drivers/modules/oneview/deploy_utils.py
+++ b/ironic/drivers/modules/oneview/deploy_utils.py
@@ -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
 
diff --git a/ironic/drivers/modules/oneview/power.py b/ironic/drivers/modules/oneview/power.py
index 17801e182..dc4ebcfd8 100644
--- a/ironic/drivers/modules/oneview/power.py
+++ b/ironic/drivers/modules/oneview/power.py
@@ -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
diff --git a/ironic/drivers/modules/oneview/vendor.py b/ironic/drivers/modules/oneview/vendor.py
index 18001a6c6..d785bc738 100644
--- a/ironic/drivers/modules/oneview/vendor.py
+++ b/ironic/drivers/modules/oneview/vendor.py
@@ -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
diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py
index 0ddf747ab..7e844c0de 100644
--- a/ironic/drivers/modules/pxe.py
+++ b/ironic/drivers/modules/pxe.py
@@ -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
diff --git a/ironic/drivers/modules/seamicro.py b/ironic/drivers/modules/seamicro.py
index a57c7a163..818248bee 100644
--- a/ironic/drivers/modules/seamicro.py
+++ b/ironic/drivers/modules/seamicro.py
@@ -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
diff --git a/ironic/drivers/modules/snmp.py b/ironic/drivers/modules/snmp.py
index af5d7b72b..b8de688ec 100644
--- a/ironic/drivers/modules/snmp.py
+++ b/ironic/drivers/modules/snmp.py
@@ -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
diff --git a/ironic/drivers/modules/ssh.py b/ironic/drivers/modules/ssh.py
index 99fe2c235..fbf8803d0 100644
--- a/ironic/drivers/modules/ssh.py
+++ b/ironic/drivers/modules/ssh.py
@@ -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
diff --git a/ironic/drivers/modules/ucs/helper.py b/ironic/drivers/modules/ucs/helper.py
index a907e0c28..b27e8c1c9 100644
--- a/ironic/drivers/modules/ucs/helper.py
+++ b/ironic/drivers/modules/ucs/helper.py
@@ -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')
diff --git a/ironic/drivers/modules/ucs/management.py b/ironic/drivers/modules/ucs/management.py
index 7a04e7657..8f6a45a27 100644
--- a/ironic/drivers/modules/ucs/management.py
+++ b/ironic/drivers/modules/ucs/management.py
@@ -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
 
diff --git a/ironic/drivers/modules/ucs/power.py b/ironic/drivers/modules/ucs/power.py
index f819e8ada..2a1835169 100644
--- a/ironic/drivers/modules/ucs/power.py
+++ b/ironic/drivers/modules/ucs/power.py
@@ -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
diff --git a/ironic/drivers/modules/virtualbox.py b/ironic/drivers/modules/virtualbox.py
index e8095232e..c3eda6a4c 100644
--- a/ironic/drivers/modules/virtualbox.py
+++ b/ironic/drivers/modules/virtualbox.py
@@ -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
diff --git a/ironic/drivers/modules/wol.py b/ironic/drivers/modules/wol.py
index 34458166d..9c6d23202 100644
--- a/ironic/drivers/modules/wol.py
+++ b/ironic/drivers/modules/wol.py
@@ -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
diff --git a/ironic/drivers/utils.py b/ironic/drivers/utils.py
index 60fe13fc1..10841f1a8 100644
--- a/ironic/drivers/utils.py
+++ b/ironic/drivers/utils.py
@@ -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