Merge "Removes from tox.ini flake configuration _ as builtin"

rally/benchmark/context/flavors.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from rally.benchmark.context import base
+from rally.common.i18n import _
 from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts

rally/benchmark/scenarios/dummy/dummy.py

@@ -15,6 +15,7 @@ import time
 
 from rally.benchmark.scenarios import base
 from rally.benchmark import validation
+from rally.common.i18n import _
 from rally import exceptions
 
 

rally/benchmark/scenarios/sahara/utils.py

@@ -21,6 +21,7 @@ from saharaclient.api import base as sahara_base
 
 from rally.benchmark.scenarios import base
 from rally.benchmark import utils as bench_utils
+from rally.common.i18n import _
 from rally.common import log as logging
 from rally import consts
 from rally import exceptions

rally/benchmark/utils.py

@@ -20,6 +20,7 @@ import traceback
 from novaclient import exceptions as nova_exc
 import six
 
+from rally.common.i18n import _
 from rally.common import log as logging
 from rally import exceptions
 

samples/plugins/sla/sla_plugin.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from rally.benchmark.sla import base
+from rally.common.i18n import _
 
 
 class MaxDurationRange(base.SLA):

tox.ini

@@ -47,7 +47,6 @@ downloadcache = ~/cache/pip
 [flake8]
 ignore = E126,H703
 show-source = true
-builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,build,setup.py
 
 [hacking]