Fixes import order nits

Change-Id: I5a527e0f5010171a202de5894d124d213d22a073

22 files changed, 26 insertions, 29 deletions

diff --git a/keystone/catalog/__init__.py b/keystone/catalog/__init__.py
index 9c710151..d067b981 100644
--- a/keystone/catalog/__init__.py
+++ b/keystone/catalog/__init__.py
@@ -14,6 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone.catalog.core import *
 from keystone.catalog import controllers
+from keystone.catalog.core import *
 from keystone.catalog import routers
diff --git a/keystone/cli.py b/keystone/cli.py
index 7b9457d5..c08ade65 100644
--- a/keystone/cli.py
+++ b/keystone/cli.py
@@ -16,8 +16,8 @@
 
 from __future__ import absolute_import
 
-from keystone import config
 from keystone.common import openssl
+from keystone import config
 from keystone.openstack.common import cfg
 from keystone.openstack.common import importutils
 from keystone.openstack.common import jsonutils
diff --git a/keystone/common/controller.py b/keystone/common/controller.py
index 58164338..f9ce0b46 100644
--- a/keystone/common/controller.py
+++ b/keystone/common/controller.py
@@ -1,5 +1,5 @@
-import uuid
 import functools
+import uuid
 
 from keystone.common import dependency
 from keystone.common import logging
diff --git a/keystone/contrib/stats/backends/kvs.py b/keystone/contrib/stats/backends/kvs.py
index 139c44c1..06db5677 100644
--- a/keystone/contrib/stats/backends/kvs.py
+++ b/keystone/contrib/stats/backends/kvs.py
@@ -14,8 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone.contrib import stats
 from keystone.common import kvs
+from keystone.contrib import stats
 
 
 class Stats(kvs.Base, stats.Driver):
diff --git a/keystone/contrib/stats/core.py b/keystone/contrib/stats/core.py
index a479ee3c..551d9b18 100644
--- a/keystone/contrib/stats/core.py
+++ b/keystone/contrib/stats/core.py
@@ -14,14 +14,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from keystone.common import logging
+from keystone.common import manager
+from keystone.common import wsgi
 from keystone import config
 from keystone import exception
 from keystone import identity
 from keystone import policy
 from keystone import token
-from keystone.common import logging
-from keystone.common import manager
-from keystone.common import wsgi
 
 
 CONF = config.CONF
diff --git a/keystone/contrib/user_crud/core.py b/keystone/contrib/user_crud/core.py
index ae9b4c59..0df5f9de 100644
--- a/keystone/contrib/user_crud/core.py
+++ b/keystone/contrib/user_crud/core.py
@@ -17,9 +17,9 @@
 import copy
 import uuid
 
-from keystone import exception
 from keystone.common import logging
 from keystone.common import wsgi
+from keystone import exception
 from keystone import identity
 
 
diff --git a/keystone/controllers.py b/keystone/controllers.py
index 2f739039..a1275c18 100644
--- a/keystone/controllers.py
+++ b/keystone/controllers.py
@@ -14,8 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone.common import wsgi
 from keystone import catalog
+from keystone.common import wsgi
 from keystone import exception
 
 
diff --git a/keystone/identity/__init__.py b/keystone/identity/__init__.py
index f6fe4418..58853cc6 100644
--- a/keystone/identity/__init__.py
+++ b/keystone/identity/__init__.py
@@ -14,6 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone.identity.core import *
 from keystone.identity import controllers
+from keystone.identity.core import *
 from keystone.identity import routers
diff --git a/keystone/identity/routers.py b/keystone/identity/routers.py
index 293bbfd9..0e23635b 100644
--- a/keystone/identity/routers.py
+++ b/keystone/identity/routers.py
@@ -14,9 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 """WSGI Routers for the Identity service."""
+from keystone.common import router
 from keystone.common import wsgi
 from keystone.identity import controllers
-from keystone.common import router
 
 
 class Public(wsgi.ComposableRouter):
diff --git a/keystone/policy/__init__.py b/keystone/policy/__init__.py
index 8012515a..121905e4 100644
--- a/keystone/policy/__init__.py
+++ b/keystone/policy/__init__.py
@@ -14,6 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone.policy.core import *
 from keystone.policy import controllers
+from keystone.policy.core import *
 from keystone.policy import routers
diff --git a/keystone/policy/routers.py b/keystone/policy/routers.py
index dbb53e9c..270e9b76 100644
--- a/keystone/policy/routers.py
+++ b/keystone/policy/routers.py
@@ -13,8 +13,8 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-from keystone.policy import controllers
 from keystone.common import router
+from keystone.policy import controllers
 
 
 def append_v3_routers(mapper, routers):
diff --git a/keystone/service.py b/keystone/service.py
index 5ac8fdd2..14825106 100644
--- a/keystone/service.py
+++ b/keystone/service.py
@@ -17,9 +17,9 @@
 import routes
 
 from keystone import catalog
-from keystone.contrib import ec2
 from keystone.common import logging
 from keystone.common import wsgi
+from keystone.contrib import ec2
 from keystone import identity
 from keystone import policy
 from keystone import routers
diff --git a/keystone/test.py b/keystone/test.py
index 8c8520d0..bca8a22d 100644
--- a/keystone/test.py
+++ b/keystone/test.py
@@ -26,12 +26,12 @@ from paste import deploy
 import stubout
 import unittest2 as unittest
 
+from keystone import catalog
 from keystone.common import kvs
 from keystone.common import logging
 from keystone.common import utils
 from keystone.common import wsgi
 from keystone import config
-from keystone import catalog
 from keystone import identity
 from keystone import policy
 from keystone import token
diff --git a/keystone/token/__init__.py b/keystone/token/__init__.py
index d96bc669..eb4f012a 100644
--- a/keystone/token/__init__.py
+++ b/keystone/token/__init__.py
@@ -14,6 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone.token.core import *
 from keystone.token import controllers
+from keystone.token.core import *
 from keystone.token import routers
diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py
index 1d257516..70359869 100644
--- a/keystone/token/controllers.py
+++ b/keystone/token/controllers.py
@@ -1,11 +1,11 @@
-import uuid
 import json
+import uuid
 
-from keystone import config
 from keystone.common import cms
 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.openstack.common import timeutils
 from keystone.token import core
diff --git a/tests/test_backend.py b/tests/test_backend.py
index 08280213..57e41df4 100644
--- a/tests/test_backend.py
+++ b/tests/test_backend.py
@@ -15,13 +15,13 @@
 # under the License.
 
 import datetime
-import uuid
 import default_fixtures
+import uuid
 
 from keystone.catalog import core
 from keystone import exception
-from keystone import test
 from keystone.openstack.common import timeutils
+from keystone import test
 
 
 class IdentityTests(object):
diff --git a/tests/test_backend_sql.py b/tests/test_backend_sql.py
index 8306c65e..925ea912 100644
--- a/tests/test_backend_sql.py
+++ b/tests/test_backend_sql.py
@@ -16,8 +16,8 @@
 
 import uuid
 
-from keystone.common import sql
 from keystone import catalog
+from keystone.common import sql
 from keystone import config
 from keystone import exception
 from keystone import identity
diff --git a/tests/test_drivers.py b/tests/test_drivers.py
index 5eb6eca4..439b0d30 100644
--- a/tests/test_drivers.py
+++ b/tests/test_drivers.py
@@ -2,10 +2,10 @@ import inspect
 import unittest2 as unittest
 
 from keystone import catalog
+from keystone import exception
 from keystone import identity
 from keystone import policy
 from keystone import token
-from keystone import exception
 
 
 class TestDrivers(unittest.TestCase):
diff --git a/tests/test_exception.py b/tests/test_exception.py
index eb67098b..635b65de 100644
--- a/tests/test_exception.py
+++ b/tests/test_exception.py
@@ -16,8 +16,8 @@
 
 import uuid
 
-from keystone import config
 from keystone.common import wsgi
+from keystone import config
 from keystone import exception
 from keystone.openstack.common import jsonutils
 from keystone import test
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index 0b82685e..32e9ef0a 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -20,9 +20,9 @@ import webob
 
 import nose.exc
 
-from keystone import test
 from keystone.openstack.common import jsonutils
 from keystone.openstack.common import timeutils
+from keystone import test
 
 
 import default_fixtures
diff --git a/tests/test_s3_token_middleware.py b/tests/test_s3_token_middleware.py
index f3cf6c2f..733c75f0 100644
--- a/tests/test_s3_token_middleware.py
+++ b/tests/test_s3_token_middleware.py
@@ -165,7 +165,3 @@ class S3TokenMiddlewareTest(unittest.TestCase):
         req.get_response(self.middleware)
         path = req.environ['PATH_INFO']
         self.assertTrue(path.startswith('/v1/AUTH_FORCED_TENANT_ID'))
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_sql_upgrade.py b/tests/test_sql_upgrade.py
index ad4b7b06..d6fb52ec 100644
--- a/tests/test_sql_upgrade.py
+++ b/tests/test_sql_upgrade.py
@@ -22,9 +22,10 @@ from migrate.versioning import api as versioning_api
 import sqlalchemy
 
 from keystone.common import sql
+from keystone.common.sql import migration
 from keystone import config
 from keystone import test
-from keystone.common.sql import migration
+
 import default_fixtures