imports not in alphabetical order (flake8 H306)

Change-Id: I0f6c5fc27b0bb2da553e9345a8ac4949ce46e685

5 files changed, 8 insertions, 10 deletions

diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py
index f643cf27..9d4db929 100644
--- a/keystone/auth/controllers.py
+++ b/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__)
diff --git a/keystone/auth/core.py b/keystone/auth/core.py
index da70c43c..b7bdb7c6 100644
--- a/keystone/auth/core.py
+++ b/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')
diff --git a/keystone/auth/plugins/password.py b/keystone/auth/plugins/password.py
index 662cca07..ad263f77 100644
--- a/keystone/auth/plugins/password.py
+++ b/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
 
diff --git a/keystone/auth/plugins/token.py b/keystone/auth/plugins/token.py
index c84a6da3..f91fa4f1 100644
--- a/keystone/auth/plugins/token.py
+++ b/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
 
diff --git a/keystone/auth/token_factory.py b/keystone/auth/token_factory.py
index 37c9f1ed..e6bf61b4 100644
--- a/keystone/auth/token_factory.py
+++ b/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