Remove gettextutils _ injection

Now that ironic supports oslo.i18n, using the install function to
inject _ into the builtin has been deprecated. New i18n common module
used instead. In one module _ was imported from gettextutils, now
also changed to i18n import.

Closes-bug: #1346406
Change-Id: I672a975d479991982c24031e834a26e2c2811890

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/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/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,
-                           run_as_root=True,
-                           check_exit_code=[0])
+    out, _err = utils.execute('blkid', '-s', 'UUID', '-o', 'value', dev,
+                              run_as_root=True,
+                              check_exit_code=[0])
     return out.strip()
 
 

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]