summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-07-10 22:17:52 +0000
committerGerrit Code Review <review@openstack.org>2014-07-10 22:17:53 +0000
commit5d53ea479fff7f172bd3b5be07bf24f7adbaebcb (patch)
tree3b958da8bfc72aa839f8456e1fff3cef6691e436
parent35c28108a3f5680f942d4ba81531898c9cd214f8 (diff)
parentb416b5d0111494becc85063b0a35d4317ccfb3b2 (diff)
downloadoslo-config-5d53ea479fff7f172bd3b5be07bf24f7adbaebcb.tar.gz
Merge "Changes imports order to pass H305, enables check"
-rw-r--r--oslo/config/generator.py2
-rw-r--r--tests/test_cfg.py2
-rw-r--r--tox.ini1
3 files changed, 2 insertions, 3 deletions
diff --git a/oslo/config/generator.py b/oslo/config/generator.py
index 57c70bd..b94df67 100644
--- a/oslo/config/generator.py
+++ b/oslo/config/generator.py
@@ -109,7 +109,7 @@ import sys
import textwrap
from oslo.config import cfg
-import stevedore.named
+import stevedore.named # noqa
LOG = logging.getLogger(__name__)
diff --git a/tests/test_cfg.py b/tests/test_cfg.py
index 268565f..9e98391 100644
--- a/tests/test_cfg.py
+++ b/tests/test_cfg.py
@@ -22,12 +22,12 @@ import tempfile
import fixtures
import mock
+from oslotest import base
import six
from six import moves
import testscenarios
from oslo.config import cfg
-from oslotest import base
load_tests = testscenarios.load_tests_apply_scenarios
diff --git a/tox.ini b/tox.ini
index 52c13cc..ce20147 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,6 +24,5 @@ commands = python setup.py build_sphinx
[flake8]
show-source = True
-ignore = H305
exclude = .tox,dist,doc,*.egg,build
builtins = _