imports not in alphabetical order (flake8 H306)

Change-Id: I0f6c5fc27b0bb2da553e9345a8ac4949ce46e685

bin/keystone-all

@@ -21,9 +21,9 @@ if os.path.exists(os.path.join(possible_topdir,
 from paste import deploy
 import pbr.version
 
-from keystone import config
-from keystone.common import wsgi_server
 from keystone.common import utils
+from keystone.common import wsgi_server
+from keystone import config
 from keystone.openstack.common import importutils
 
 

httpd/keystone.py

@@ -2,8 +2,8 @@ import os
 
 from paste import deploy
 
-from keystone import config
 from keystone.common import logging
+from keystone import config
 
 LOG = logging.getLogger(__name__)
 CONF = config.CONF

keystone/auth/controllers.py

@@ -17,15 +17,15 @@
 import json
 
 from keystone.auth import token_factory
-from keystone.common import controller
 from keystone.common import cms
+from keystone.common import controller
 from keystone.common import logging
 from keystone import config
 from keystone import exception
 from keystone import identity
+from keystone.openstack.common import importutils
 from keystone import token
 from keystone import trust
-from keystone.openstack.common import importutils
 
 
 LOG = logging.getLogger(__name__)

keystone/auth/core.py

@@ -14,8 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone import exception
 from keystone.common import dependency
+from keystone import exception
 
 
 @dependency.requires('identity_api')

keystone/auth/plugins/password.py

@@ -14,9 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
-from keystone.common import logging
 from keystone import auth
+from keystone.common import logging
 from keystone import exception
 from keystone import identity
 

keystone/auth/plugins/token.py

@@ -14,9 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
-from keystone.common import logging
 from keystone import auth
+from keystone.common import logging
 from keystone import exception
 from keystone import token
 

keystone/auth/token_factory.py

@@ -21,17 +21,17 @@ import subprocess
 import uuid
 import webob
 
+from keystone import catalog
 from keystone.common import cms
 from keystone.common import logging
 from keystone.common import utils
-from keystone import catalog
 from keystone import config
 from keystone import exception
 from keystone import identity
-from keystone import token as token_module
-from keystone import trust
 from keystone.openstack.common import jsonutils
 from keystone.openstack.common import timeutils
+from keystone import token as token_module
+from keystone import trust
 
 
 CONF = config.CONF

keystone/common/sql/core.py

@@ -22,9 +22,9 @@ import sqlalchemy.engine.url
 from sqlalchemy.exc import DisconnectionError
 from sqlalchemy.ext import declarative
 import sqlalchemy.orm
+from sqlalchemy.orm.attributes import InstrumentedAttribute
 import sqlalchemy.pool
 from sqlalchemy import types as sql_types
-from sqlalchemy.orm.attributes import InstrumentedAttribute
 
 from keystone.common import logging
 from keystone import config

keystone/common/sql/legacy.py

@@ -20,9 +20,9 @@ import sqlalchemy
 from sqlalchemy import exc
 
 from keystone.common import logging
+from keystone import config
 from keystone.contrib.ec2.backends import sql as ec2_sql
 from keystone.identity.backends import sql as identity_sql
-from keystone import config
 
 
 LOG = logging.getLogger(__name__)

keystone/common/sql/migrate_repo/versions/008_create_default_domain.py

@@ -18,6 +18,7 @@ import json
 
 import sqlalchemy as sql
 from sqlalchemy import orm
+
 from keystone import config
 
 

keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py

@@ -39,6 +39,7 @@ of integrity constraints.
 
 import sqlalchemy as sql
 from sqlalchemy.orm import sessionmaker
+
 from keystone import config
 
 

keystone/common/sql/migrate_repo/versions/023_drop_credential_constraints.py

@@ -14,10 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
+from migrate import ForeignKeyConstraint
 import sqlalchemy
 from sqlalchemy.orm import sessionmaker
-from migrate import ForeignKeyConstraint
 
 MYSQL_FKEY_QUERY = ("select CONSTRAINT_NAME from "
                     "INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS "

keystone/common/sql/nova.py

@@ -18,8 +18,8 @@
 
 import uuid
 
-from keystone import config
 from keystone.common import logging
+from keystone import config
 from keystone.contrib.ec2.backends import sql as ec2_sql
 from keystone.identity.backends import sql as identity_sql
 

keystone/controllers.py

@@ -14,11 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone.common import wsgi
 from keystone.common import logging
+from keystone.common import wsgi
 from keystone import config
 from keystone import exception
 
+
 LOG = logging.getLogger(__name__)
 CONF = config.CONF
 

keystone/policy/backends/rules.py

@@ -20,10 +20,10 @@
 import os.path
 
 from keystone.common import logging
-from keystone.openstack.common import policy as common_policy
 from keystone.common import utils
 from keystone import config
 from keystone import exception
+from keystone.openstack.common import policy as common_policy
 from keystone import policy
 
 

keystone/service.py

@@ -18,11 +18,11 @@ import routes
 
 from keystone import auth
 from keystone import catalog
-from keystone import config
-from keystone import controllers
 from keystone.common import logging
 from keystone.common import wsgi
+from keystone import config
 from keystone.contrib import ec2
+from keystone import controllers
 from keystone import credential
 from keystone import identity
 from keystone import policy

keystone/trust/backends/kvs.py

@@ -19,10 +19,9 @@ only to be used for testing purposes
 """
 import copy
 
-
 from keystone.common import kvs
-from keystone.openstack.common import timeutils
 from keystone import exception
+from keystone.openstack.common import timeutils
 from keystone import trust
 
 

keystone/trust/controllers.py

@@ -1,11 +1,11 @@
 import uuid
 
-from keystone import config
-from keystone import exception
-from keystone import identity
 from keystone.common import controller
 from keystone.common import dependency
 from keystone.common import logging
+from keystone import config
+from keystone import exception
+from keystone import identity
 from keystone.openstack.common import timeutils
 
 

tests/test_backend_kvs.py

@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import uuid
+
 import nose.exc
 
 from keystone import catalog

tests/test_backend_ldap.py

@@ -16,6 +16,7 @@
 # under the License.
 
 import uuid
+
 import nose.exc
 
 from keystone.common.ldap import fakeldap

tests/test_contrib_s3_core.py

@@ -16,8 +16,8 @@
 
 import uuid
 
-from keystone.contrib import s3
 from keystone.contrib import ec2
+from keystone.contrib import s3
 
 from keystone import exception
 from keystone import test

tests/test_keystoneclient.py

@@ -19,9 +19,9 @@ import webob
 
 import nose.exc
 
+from keystone import config
 from keystone.openstack.common import jsonutils
 from keystone.openstack.common import timeutils
-from keystone import config
 from keystone import test
 
 import default_fixtures

tests/test_policy.py

@@ -21,9 +21,9 @@ import urllib2
 
 from keystone import config
 from keystone import exception
-from keystone import test
 from keystone.openstack.common import policy as common_policy
 from keystone.policy.backends import rules
+from keystone import test
 
 
 CONF = config.CONF

tests/test_v3_auth.py

@@ -17,8 +17,8 @@ import uuid
 
 import nose.exc
 
-from keystone.common import cms
 from keystone import auth
+from keystone.common import cms
 from keystone import config
 from keystone import exception
 

tests/test_wsgi.py

@@ -17,9 +17,9 @@
 import webob
 
 from keystone.common import wsgi
+from keystone import exception
 from keystone.openstack.common import jsonutils
 from keystone import test
-from keystone import exception
 
 
 class FakeApp(wsgi.Application):

tox.ini

@@ -32,12 +32,11 @@ commands = {posargs}
 show-source = true
 
 # H304: no relative imports.
-# H306: imports not in alphabetical order
 # H401: docstring should not start with a space
 # H402: one line docstring needs punctuation
 # H403: multi line docstring end on new line
 # H404: multi line docstring should start with a summary
-ignore = H304,H306,H401,H402,H403,H404
+ignore = H304,H401,H402,H403,H404
 
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,vendor