From a2d5d3c944c662d3f46433c4d782efdec76a8d28 Mon Sep 17 00:00:00 2001
From: Prabhjyot Singh Sodhi <prabhjyotsingh95@gmail.com>
Date: Thu, 19 Mar 2015 19:02:32 +0530
Subject: [PATCH] Removes from tox.ini flake configuration _ as builtin

and Fix all bugs

Fixes #1432898

Change-Id: Ib879d0b515366b143b6c0dbb8b0a848dcd6d292a
---
 rally/benchmark/context/flavors.py        | 1 +
 rally/benchmark/scenarios/dummy/dummy.py  | 1 +
 rally/benchmark/scenarios/sahara/utils.py | 1 +
 rally/benchmark/utils.py                  | 1 +
 samples/plugins/sla/sla_plugin.py         | 1 +
 tox.ini                                   | 1 -
 6 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rally/benchmark/context/flavors.py b/rally/benchmark/context/flavors.py
index 4085c8b80f..5d059556c8 100755
--- a/rally/benchmark/context/flavors.py
+++ b/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
diff --git a/rally/benchmark/scenarios/dummy/dummy.py b/rally/benchmark/scenarios/dummy/dummy.py
index dfa2f9512a..309d6236f0 100644
--- a/rally/benchmark/scenarios/dummy/dummy.py
+++ b/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
 
 
diff --git a/rally/benchmark/scenarios/sahara/utils.py b/rally/benchmark/scenarios/sahara/utils.py
index 57f4b76874..931eaddc3c 100644
--- a/rally/benchmark/scenarios/sahara/utils.py
+++ b/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
diff --git a/rally/benchmark/utils.py b/rally/benchmark/utils.py
index a048ed2264..f4c90c60b8 100644
--- a/rally/benchmark/utils.py
+++ b/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
 
diff --git a/samples/plugins/sla/sla_plugin.py b/samples/plugins/sla/sla_plugin.py
index 2f0812286c..7ced046e65 100644
--- a/samples/plugins/sla/sla_plugin.py
+++ b/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):
diff --git a/tox.ini b/tox.ini
index c755e6dc78..0d03d172b8 100644
--- a/tox.ini
+++ b/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]