Permalink
Browse files

Merge "Fixes import order nits"

  • Loading branch information...
2 parents df8096f + 9af1d7b commit cc621dcd5c5643a3e2ddcd8c9dafb77f764d936b Jenkins committed with openstack-gerrit Jan 12, 2013
@@ -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
View
@@ -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
@@ -1,5 +1,5 @@
-import uuid
import functools
+import uuid
from keystone.common import dependency
from keystone.common import logging
@@ -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):
@@ -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
@@ -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
View
@@ -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
@@ -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
@@ -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):
@@ -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
@@ -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):
View
@@ -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
View
@@ -26,12 +26,12 @@
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
@@ -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
@@ -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
View
@@ -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):
@@ -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
View
@@ -2,10 +2,10 @@
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):
View
@@ -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
@@ -20,9 +20,9 @@
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
@@ -165,7 +165,3 @@ def test_authorization_nova_toconnect(self):
req.get_response(self.middleware)
path = req.environ['PATH_INFO']
self.assertTrue(path.startswith('/v1/AUTH_FORCED_TENANT_ID'))
-
-
-if __name__ == '__main__':
- unittest.main()
@@ -22,9 +22,10 @@
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

0 comments on commit cc621dc

Please sign in to comment.