summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDina Belova <dbelova@mirantis.com>2013-06-04 12:24:15 +0400
committerDina Belova <dbelova@mirantis.com>2013-06-04 13:47:19 +0400
commit6d276814bf91b5406403191c76ea59f81a32f568 (patch)
tree43db24e233e33d25c4acdddf4d5345cd42a45473
parente3e497915f0cc47bba10aad4ef5e940669801cb3 (diff)
downloadoslo-6d276814bf91b5406403191c76ea59f81a32f568.tar.gz
oslo-6d276814bf91b5406403191c76ea59f81a32f568.tar.xz
oslo-6d276814bf91b5406403191c76ea59f81a32f568.zip
Enable H306 hacking check.
H306 - imports not in alphabetical order. Change-Id: Iaa93bcafed562833318ac86241ad36662c2d8ca6
-rw-r--r--openstack/common/db/sqlalchemy/session.py2
-rw-r--r--openstack/common/policy.py4
-rw-r--r--tests/unit/rpc/test_qpid.py1
-rw-r--r--tests/unit/test_policy.py4
-rw-r--r--tox.ini2
5 files changed, 7 insertions, 6 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py
index fbc5c91..dbc0bc8 100644
--- a/openstack/common/db/sqlalchemy/session.py
+++ b/openstack/common/db/sqlalchemy/session.py
@@ -256,8 +256,8 @@ from sqlalchemy.pool import NullPool, StaticPool
from sqlalchemy.sql.expression import literal_column
from openstack.common.db import exception
-from openstack.common import log as logging
from openstack.common.gettextutils import _
+from openstack.common import log as logging
from openstack.common import timeutils
DEFAULT = 'DEFAULT'
diff --git a/openstack/common/policy.py b/openstack/common/policy.py
index 3669f9b..f3e62ba 100644
--- a/openstack/common/policy.py
+++ b/openstack/common/policy.py
@@ -59,13 +59,13 @@ as it allows particular rules to be explicitly disabled.
import abc
import re
import urllib
+import urllib2
from oslo.config import cfg
import six
-import urllib2
-from openstack.common.gettextutils import _
from openstack.common import fileutils
+from openstack.common.gettextutils import _
from openstack.common import jsonutils
from openstack.common import log as logging
diff --git a/tests/unit/rpc/test_qpid.py b/tests/unit/rpc/test_qpid.py
index 1630ac4..283a7d2 100644
--- a/tests/unit/rpc/test_qpid.py
+++ b/tests/unit/rpc/test_qpid.py
@@ -34,6 +34,7 @@ from tests import utils
try:
import qpid
+
from openstack.common.rpc import impl_qpid
except ImportError:
qpid = None
diff --git a/tests/unit/test_policy.py b/tests/unit/test_policy.py
index cc96168..33b291a 100644
--- a/tests/unit/test_policy.py
+++ b/tests/unit/test_policy.py
@@ -19,11 +19,11 @@
import os
import urllib
+import urllib2
import mock
-from six import StringIO
-import urllib2
from oslo.config import cfg
+from six import StringIO
from openstack.common import jsonutils
from openstack.common import policy
diff --git a/tox.ini b/tox.ini
index af976a2..379bc11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ commands =
[flake8]
show-source = True
-ignore = H202,H302,H304,H306,H404
+ignore = H202,H302,H304,H404
exclude = .venv,.tox,dist,doc,*.egg,.update-venv
[testenv:pep8]