Merge "Remove gettextutils _ injection"

ironic/api/controllers/v1/driver.py

@@ -23,6 +23,7 @@ import wsmeext.pecan as wsme_pecan
 from ironic.api.controllers import base
 from ironic.api.controllers import link
 from ironic.common import exception
+from ironic.common.i18n import _
 
 
 # Property information for drivers:

ironic/api/controllers/v1/node.py

@@ -30,6 +30,7 @@ from ironic.api.controllers.v1 import port
 from ironic.api.controllers.v1 import types
 from ironic.api.controllers.v1 import utils as api_utils
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import states as ir_states
 from ironic.common import utils
 from ironic import objects

ironic/api/controllers/v1/port.py

@@ -28,6 +28,7 @@ from ironic.api.controllers.v1 import collection
 from ironic.api.controllers.v1 import types
 from ironic.api.controllers.v1 import utils as api_utils
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic import objects
 
 

ironic/api/controllers/v1/types.py

@@ -20,6 +20,7 @@ import wsme
 from wsme import types as wtypes
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import utils
 
 

ironic/api/controllers/v1/utils.py

@@ -18,6 +18,8 @@ import wsme
 
 from oslo.config import cfg
 
+from ironic.common.i18n import _
+
 CONF = cfg.CONF
 
 

ironic/api/middleware/auth_token.py

@@ -17,6 +17,7 @@ import re
 from keystonemiddleware import auth_token
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import utils
 from ironic.openstack.common import log
 

ironic/api/middleware/parsable_error.py

@@ -26,6 +26,7 @@ import json
 import webob
 from xml import etree as et
 
+from ironic.common.i18n import _
 from ironic.openstack.common import log
 
 LOG = log.getLogger(__name__)

ironic/cmd/api.py

@@ -25,6 +25,7 @@ from six.moves import socketserver
 from wsgiref import simple_server
 
 from ironic.api import app
+from ironic.common.i18n import _
 from ironic.common import service as ironic_service
 from ironic.openstack.common import log
 

ironic/common/disk_partitioner.py

@@ -18,6 +18,7 @@ import re
 from oslo.config import cfg
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import utils
 from ironic.openstack.common import log as logging
 from ironic.openstack.common import loopingcall

ironic/common/driver_factory.py

@@ -16,6 +16,7 @@
 from oslo.config import cfg
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.openstack.common import lockutils
 from ironic.openstack.common import log
 from stevedore import dispatch

ironic/common/glance_service/base_image_service.py

@@ -28,6 +28,7 @@ import six.moves.urllib.parse as urlparse
 
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
+from ironic.common.i18n import _
 
 from oslo.config import cfg
 

ironic/common/glance_service/v2/image_service.py

@@ -20,6 +20,7 @@ from ironic.common import exception as exc
 from ironic.common.glance_service import base_image_service
 from ironic.common.glance_service import service
 from ironic.common.glance_service import service_utils
+from ironic.common.i18n import _
 from ironic.common import utils
 
 

ironic/common/hash_ring.py

@@ -21,6 +21,7 @@ import threading
 from oslo.config import cfg
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.db import api as dbapi
 
 hash_opts = [

ironic/common/images.py

@@ -27,6 +27,7 @@ from oslo.config import cfg
 
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import image_service as service
 from ironic.common import paths
 from ironic.common import utils

ironic/common/keystone.py

@@ -19,6 +19,7 @@ from oslo.config import cfg
 from six.moves.urllib import parse
 
 from ironic.common import exception
+from ironic.common.i18n import _
 
 CONF = cfg.CONF
 

ironic/common/service.py

@@ -23,6 +23,7 @@ from oslo import messaging
 from oslo.utils import importutils
 
 from ironic.common import config
+from ironic.common.i18n import _
 from ironic.common import rpc
 from ironic.objects import base as objects_base
 from ironic.openstack.common import context

ironic/common/swift.py

@@ -21,6 +21,7 @@ from swiftclient import exceptions as swift_exceptions
 from swiftclient import utils as swift_utils
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import keystone
 from ironic.openstack.common import log as logging
 

ironic/common/utils.py

@@ -34,6 +34,7 @@ import paramiko
 import six
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.openstack.common import log as logging
 from ironic.openstack.common import processutils
 

ironic/conductor/manager.py

@@ -57,6 +57,7 @@ from ironic.common import driver_factory
 from ironic.common import exception
 from ironic.common import hash_ring as hash
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import rpc
 from ironic.common import states
 from ironic.common import utils as ironic_utils

ironic/conductor/rpcapi.py

@@ -24,6 +24,7 @@ from oslo import messaging
 
 from ironic.common import exception
 from ironic.common import hash_ring as hash
+from ironic.common.i18n import _
 from ironic.common import rpc
 from ironic.conductor import manager
 from ironic.objects import base as objects_base

ironic/conductor/utils.py

@@ -15,6 +15,7 @@
 from oslo.utils import excutils
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.openstack.common.gettextutils import _LI

ironic/db/sqlalchemy/api.py

@@ -27,6 +27,7 @@ from oslo.utils import timeutils
 from sqlalchemy.orm.exc import NoResultFound
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import states
 from ironic.common import utils
 from ironic.db import api

ironic/dhcp/neutron.py

@@ -22,6 +22,7 @@ from oslo.config import cfg
 
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import keystone
 from ironic.common import network
 from ironic.dhcp import base

ironic/drivers/base.py

@@ -22,6 +22,7 @@ import abc
 import six
 
 from ironic.common import exception
+from ironic.common.i18n import _
 
 
 @six.add_metaclass(abc.ABCMeta)

ironic/drivers/drac.py

@@ -15,6 +15,7 @@ DRAC Driver for remote system management using Dell Remote Access Card.
 """
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.drivers import base
 from ironic.drivers.modules.drac import power
 from ironic.drivers.modules import ipmitool

ironic/drivers/fake.py

@@ -20,6 +20,7 @@ Fake drivers used in testing.
 from oslo.utils import importutils
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.drivers import base
 from ironic.drivers.modules import agent
 from ironic.drivers.modules.drac import power as drac_power

ironic/drivers/modules/agent.py

@@ -21,6 +21,7 @@ from oslo.utils import excutils
 from ironic.common import dhcp_factory
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import image_service
 from ironic.common import keystone
 from ironic.common import paths

ironic/drivers/modules/agent_client.py

@@ -16,6 +16,7 @@ from oslo.config import cfg
 import requests
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.openstack.common import jsonutils
 from ironic.openstack.common import log
 

ironic/drivers/modules/console_utils.py

@@ -28,6 +28,7 @@ from oslo.config import cfg
 
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import utils
 from ironic.openstack.common import log as logging
 from ironic.openstack.common import loopingcall

ironic/drivers/modules/deploy_utils.py

@@ -25,6 +25,7 @@ from oslo.utils import excutils
 
 from ironic.common import disk_partitioner
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import utils
 from ironic.drivers.modules import image_cache
 from ironic.openstack.common import log as logging
@@ -153,9 +154,9 @@ def mkfs_ephemeral(dev, ephemeral_format, label="ephemeral0"):
 
 def block_uuid(dev):
     """Get UUID of a block device."""
-    out, _ = utils.execute('blkid', '-s', 'UUID', '-o', 'value', dev,
+    out, _err = utils.execute('blkid', '-s', 'UUID', '-o', 'value', dev,
-                           run_as_root=True,
+                              run_as_root=True,
-                           check_exit_code=[0])
+                              check_exit_code=[0])
     return out.strip()
 
 

ironic/drivers/modules/drac/common.py

@@ -16,6 +16,7 @@ Common functionalities shared between different DRAC modules.
 """
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.drivers.modules.drac import client as drac_client
 from ironic.openstack.common import importutils
 

ironic/drivers/modules/fake.py

@@ -26,6 +26,7 @@ on seprate vendor_passthru methods.
 
 from ironic.common import boot_devices
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import states
 from ironic.drivers import base
 

ironic/drivers/modules/iboot.py

@@ -23,6 +23,7 @@ from oslo.utils import importutils
 
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers import base

ironic/drivers/modules/ilo/common.py

@@ -20,6 +20,7 @@ from oslo.config import cfg
 from oslo.utils import importutils
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.openstack.common import log as logging
 
 ilo_client = importutils.try_import('proliantutils.ilo.ribcl')

ironic/drivers/modules/ilo/power.py

@@ -20,6 +20,7 @@ from oslo.config import cfg
 from oslo.utils import importutils
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers import base

ironic/drivers/modules/image_cache.py

@@ -26,6 +26,7 @@ from oslo.config import cfg
 
 from ironic.common import exception
 from ironic.common.glance_service import service_utils
+from ironic.common.i18n import _
 from ironic.common import images
 from ironic.common import utils
 from ironic.openstack.common import fileutils

ironic/drivers/modules/ipminative.py

@@ -25,6 +25,7 @@ from oslo.utils import importutils
 from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers import base

ironic/drivers/modules/ipmitool.py

@@ -42,6 +42,7 @@ from oslo.utils import excutils
 from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager

ironic/drivers/modules/iscsi_deploy.py

@@ -19,6 +19,7 @@ from oslo.config import cfg
 
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import image_service as service
 from ironic.common import keystone
 from ironic.common import states

ironic/drivers/modules/pxe.py

@@ -25,6 +25,7 @@ from oslo.config import cfg
 from ironic.common import dhcp_factory
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import image_service as service
 from ironic.common import paths
 from ironic.common import pxe_utils

ironic/drivers/modules/seamicro.py

@@ -25,6 +25,7 @@ from oslo.utils import importutils
 from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import states
 from ironic.conductor import task_manager
 from ironic.drivers import base

ironic/drivers/modules/ssh.py

@@ -33,12 +33,12 @@ from oslo.config import cfg
 from ironic.common import boot_devices
 from ironic.common import exception
 from ironic.common import i18n
+from ironic.common.i18n import _
 from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
 from ironic.drivers import base
 from ironic.drivers import utils as driver_utils
-from ironic.openstack.common.gettextutils import _
 from ironic.openstack.common import log as logging
 from ironic.openstack.common import processutils
 

ironic/drivers/pxe.py

@@ -20,6 +20,7 @@ PXE Driver and supporting meta-classes.
 from oslo.utils import importutils
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.drivers import base
 from ironic.drivers.modules import iboot
 from ironic.drivers.modules.ilo import power as ilo_power

ironic/drivers/utils.py

@@ -13,6 +13,7 @@
 # under the License.
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.drivers import base
 
 

ironic/objects/base.py

@@ -21,6 +21,7 @@ from oslo import messaging
 import six
 
 from ironic.common import exception
+from ironic.common.i18n import _
 from ironic.objects import utils as obj_utils
 from ironic.openstack.common import context
 from ironic.openstack.common import log as logging

ironic/objects/conductor.py

@@ -14,6 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from ironic.common.i18n import _
 from ironic.db import api as db_api
 from ironic.objects import base
 from ironic.objects import utils

ironic/objects/utils.py

@@ -22,6 +22,8 @@ import netaddr
 from oslo.utils import timeutils
 import six
 
+from ironic.common.i18n import _
+
 
 def datetime_or_none(dt):
     """Validate a datetime or None value."""

ironic/tests/db/sqlalchemy/test_migrations.py

@@ -49,6 +49,7 @@ from oslo.db.sqlalchemy import utils as db_utils
 import sqlalchemy
 import sqlalchemy.exc
 
+from ironic.common.i18n import _
 from ironic.common import utils
 from ironic.db.sqlalchemy import migration
 from ironic.db.sqlalchemy import models

tox.ini

@@ -43,7 +43,6 @@ commands = {posargs}
 
 ignore = E12,E711
 select = E713
-builtins = _
 exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,*ironic/nova*
 
 [hacking]