From 9af1d7bebd04a5cebefbaa6f6f9885cd33e2bbd7 Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Thu, 3 Jan 2013 17:58:48 +0800 Subject: Fixes import order nits Change-Id: I5a527e0f5010171a202de5894d124d213d22a073 --- keystone/token/__init__.py | 2 +- keystone/token/controllers.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keystone/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 -- cgit