diff --git a/keystone/catalog/backends/sql.py b/keystone/catalog/backends/sql.py
index 3f9a6abfcb..33dd59f19d 100644
--- a/keystone/catalog/backends/sql.py
+++ b/keystone/catalog/backends/sql.py
@@ -16,10 +16,10 @@
 # under the License.
 
 from keystone import catalog
-from keystone import config
-from keystone import exception
 from keystone.common import sql
 from keystone.common.sql import migration
+from keystone import config
+from keystone import exception
 
 
 CONF = config.CONF
diff --git a/keystone/catalog/backends/templated.py b/keystone/catalog/backends/templated.py
index 12c2a6d423..b9625cfa59 100644
--- a/keystone/catalog/backends/templated.py
+++ b/keystone/catalog/backends/templated.py
@@ -16,9 +16,9 @@
 
 import os.path
 
-from keystone import config
-from keystone.common import logging
 from keystone.catalog.backends import kvs
+from keystone.common import logging
+from keystone import config
 
 
 LOG = logging.getLogger(__name__)
diff --git a/keystone/catalog/core.py b/keystone/catalog/core.py
index 923823f8c8..bc3e72beca 100644
--- a/keystone/catalog/core.py
+++ b/keystone/catalog/core.py
@@ -19,13 +19,13 @@
 
 import uuid
 
+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 manager
-from keystone.common import wsgi
 
 
 CONF = config.CONF
diff --git a/keystone/common/bufferedhttp.py b/keystone/common/bufferedhttp.py
index d417437f80..8738cacadb 100644
--- a/keystone/common/bufferedhttp.py
+++ b/keystone/common/bufferedhttp.py
@@ -28,8 +28,8 @@ BufferedHTTPResponse.
     make all calls through httplib.
 """
 
-from urllib import quote
 import time
+from urllib import quote
 
 from eventlet.green.httplib import (CONTINUE, HTTPConnection, HTTPMessage,
                                     HTTPResponse, HTTPSConnection, _UNKNOWN)
diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py
index 695db70031..a06c9e1207 100644
--- a/keystone/common/ldap/core.py
+++ b/keystone/common/ldap/core.py
@@ -16,9 +16,9 @@
 
 import ldap
 
-from keystone import exception
-from keystone.common import logging
 from keystone.common.ldap import fakeldap
+from keystone.common import logging
+from keystone import exception
 
 
 LOG = logging.getLogger(__name__)
diff --git a/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py b/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py
index 1ee69c03e0..f42aa0d799 100644
--- a/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py
+++ b/keystone/common/sql/migrate_repo/versions/001_add_initial_tables.py
@@ -14,16 +14,16 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from sqlalchemy import *
 from migrate import *
+from sqlalchemy import *
 
 from keystone.common import sql
 
 # these are to make sure all the models we care about are defined
+import keystone.catalog.backends.sql
+import keystone.contrib.ec2.backends.sql
 import keystone.identity.backends.sql
 import keystone.token.backends.sql
-import keystone.contrib.ec2.backends.sql
-import keystone.catalog.backends.sql
 
 
 def upgrade(migrate_engine):
diff --git a/keystone/common/sql/util.py b/keystone/common/sql/util.py
index 8c98aeadbe..195adc8302 100644
--- a/keystone/common/sql/util.py
+++ b/keystone/common/sql/util.py
@@ -17,8 +17,8 @@
 import os
 import shutil
 
-from keystone import config
 from keystone.common.sql import migration
+from keystone import config
 
 
 CONF = config.CONF
diff --git a/keystone/common/utils.py b/keystone/common/utils.py
index c0d0ffd101..7f665a591f 100644
--- a/keystone/common/utils.py
+++ b/keystone/common/utils.py
@@ -30,8 +30,8 @@ import urllib
 
 import passlib.hash
 
-from keystone import config
 from keystone.common import logging
+from keystone import config
 
 
 CONF = config.CONF
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
index 5bd958caa8..af57493fc4 100644
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -30,9 +30,9 @@ import ssl
 import webob.dec
 import webob.exc
 
-from keystone import exception
 from keystone.common import logging
 from keystone.common import utils
+from keystone import exception
 
 
 LOG = logging.getLogger(__name__)
diff --git a/keystone/config.py b/keystone/config.py
index 23762ccdbe..5c22c845a5 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -15,8 +15,8 @@
 # under the License.
 
 import gettext
-import sys
 import os
+import sys
 
 from keystone.common import logging
 from keystone.openstack.common import cfg
diff --git a/keystone/contrib/admin_crud/core.py b/keystone/contrib/admin_crud/core.py
index 5236ef1067..98ddd79134 100644
--- a/keystone/contrib/admin_crud/core.py
+++ b/keystone/contrib/admin_crud/core.py
@@ -15,8 +15,8 @@
 # under the License.
 
 from keystone import catalog
-from keystone import identity
 from keystone.common import wsgi
+from keystone import identity
 
 
 class CrudExtension(wsgi.ExtensionRouter):
diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py
index 7c662039d1..5bf40103b1 100644
--- a/keystone/contrib/ec2/core.py
+++ b/keystone/contrib/ec2/core.py
@@ -37,15 +37,15 @@ glance to list images needed to perform the requested task.
 import uuid
 
 from keystone import catalog
+from keystone.common import manager
+from keystone.common import utils
+from keystone.common import wsgi
 from keystone import config
 from keystone import exception
 from keystone import identity
 from keystone import policy
 from keystone import service
 from keystone import token
-from keystone.common import manager
-from keystone.common import utils
-from keystone.common import wsgi
 
 
 CONF = config.CONF
diff --git a/keystone/contrib/s3/core.py b/keystone/contrib/s3/core.py
index 0e3e1fe203..e9d9f97bff 100644
--- a/keystone/contrib/s3/core.py
+++ b/keystone/contrib/s3/core.py
@@ -28,11 +28,11 @@ import hmac
 
 from hashlib import sha1
 
-from keystone import config
-from keystone import exception
 from keystone.common import utils
 from keystone.common import wsgi
+from keystone import config
 from keystone.contrib import ec2
+from keystone import exception
 
 CONF = config.CONF
 
diff --git a/keystone/identity/backends/kvs.py b/keystone/identity/backends/kvs.py
index 4a1438f8c9..9f3bf04a14 100644
--- a/keystone/identity/backends/kvs.py
+++ b/keystone/identity/backends/kvs.py
@@ -15,10 +15,10 @@
 # under the License.
 
 from keystone import clean
-from keystone import exception
-from keystone import identity
 from keystone.common import kvs
 from keystone.common import utils
+from keystone import exception
+from keystone import identity
 
 
 def _filter_user(user_ref):
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py
index 2d0b3a19b2..47ccaa02c6 100644
--- a/keystone/identity/backends/ldap/core.py
+++ b/keystone/identity/backends/ldap/core.py
@@ -20,12 +20,12 @@ import ldap
 from ldap import filter as ldap_filter
 
 from keystone import clean
+from keystone.common import ldap as common_ldap
+from keystone.common.ldap import fakeldap
+from keystone.common import utils
 from keystone import config
 from keystone import exception
 from keystone import identity
-from keystone.common import ldap as common_ldap
-from keystone.common import utils
-from keystone.common.ldap import fakeldap
 from keystone.identity import models
 
 
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index db628f51f6..633286282d 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -18,11 +18,11 @@ import copy
 import functools
 
 from keystone import clean
+from keystone.common import sql
+from keystone.common.sql import migration
+from keystone.common import utils
 from keystone import exception
 from keystone import identity
-from keystone.common import sql
-from keystone.common import utils
-from keystone.common.sql import migration
 
 
 def _filter_user(user_ref):
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index 2e26eb15df..d5b95209af 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -16,17 +16,17 @@
 
 """Main entry point into the Identity service."""
 
-import uuid
 import urllib
 import urlparse
+import uuid
 
+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 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/middleware/core.py b/keystone/middleware/core.py
index aa02c62b24..db571667b7 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -18,10 +18,10 @@ import json
 
 import webob.exc
 
-from keystone import config
-from keystone import exception
 from keystone.common import serializer
 from keystone.common import wsgi
+from keystone import config
+from keystone import exception
 
 
 CONF = config.CONF
diff --git a/keystone/middleware/swift_auth.py b/keystone/middleware/swift_auth.py
index 569911acd2..ddcec4af0e 100644
--- a/keystone/middleware/swift_auth.py
+++ b/keystone/middleware/swift_auth.py
@@ -31,8 +31,8 @@
 
 import webob
 
-from swift.common import utils as swift_utils
 from swift.common.middleware import acl as swift_acl
+from swift.common import utils as swift_utils
 
 
 class SwiftAuth(object):
diff --git a/keystone/policy/backends/rules.py b/keystone/policy/backends/rules.py
index 0dbfb76fb8..5abfe64cfc 100644
--- a/keystone/policy/backends/rules.py
+++ b/keystone/policy/backends/rules.py
@@ -19,13 +19,13 @@
 
 import os.path
 
-from keystone import config
-from keystone import exception
-from keystone import policy
 from keystone.common import logging
 from keystone.common import policy as common_policy
 from keystone.common import utils
+from keystone import config
+from keystone import exception
 from keystone.openstack.common import cfg
+from keystone import policy
 
 
 policy_opts = [
diff --git a/keystone/policy/core.py b/keystone/policy/core.py
index a6dd00a16f..5b60443bbe 100644
--- a/keystone/policy/core.py
+++ b/keystone/policy/core.py
@@ -16,9 +16,9 @@
 
 """Main entry point into the Policy service."""
 
+from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.common import manager
 
 
 CONF = config.CONF
diff --git a/keystone/service.py b/keystone/service.py
index 4d7c7a2d52..e851cd966e 100644
--- a/keystone/service.py
+++ b/keystone/service.py
@@ -19,13 +19,13 @@ import uuid
 import routes
 
 from keystone import catalog
+from keystone.common import logging
+from keystone.common import utils
+from keystone.common import wsgi
 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 utils
-from keystone.common import wsgi
 
 
 LOG = logging.getLogger(__name__)
diff --git a/keystone/test.py b/keystone/test.py
index 6745f5e736..44857d7efb 100644
--- a/keystone/test.py
+++ b/keystone/test.py
@@ -24,11 +24,11 @@ from paste import deploy
 import stubout
 import unittest2 as unittest
 
-from keystone import config
 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.openstack.common import importutils
 
 
diff --git a/keystone/token/backends/memcache.py b/keystone/token/backends/memcache.py
index 91d547d8e6..df4dcdc314 100644
--- a/keystone/token/backends/memcache.py
+++ b/keystone/token/backends/memcache.py
@@ -19,10 +19,10 @@ import copy
 
 import memcache
 
+from keystone.common import utils
 from keystone import config
 from keystone import exception
 from keystone import token
-from keystone.common import utils
 
 
 CONF = config.CONF
diff --git a/keystone/token/core.py b/keystone/token/core.py
index 0d1101dbfd..0aa2ce4101 100644
--- a/keystone/token/core.py
+++ b/keystone/token/core.py
@@ -18,9 +18,9 @@
 
 import datetime
 
+from keystone.common import manager
 from keystone import config
 from keystone import exception
-from keystone.common import manager
 
 
 CONF = config.CONF