diff options
| author | Zhongyue Luo <zhongyue.nah@intel.com> | 2013-01-03 17:58:48 +0800 |
|---|---|---|
| committer | Zhongyue Luo <zhongyue.nah@intel.com> | 2013-01-11 09:05:11 +0800 |
| commit | 9af1d7bebd04a5cebefbaa6f6f9885cd33e2bbd7 (patch) | |
| tree | fb9d9b88d0a4d7e362c766bc31667e30b62e53a9 /keystone/token | |
| parent | 0c21f3d156b00ec78abb79478d921998498b3463 (diff) | |
Fixes import order nits
Change-Id: I5a527e0f5010171a202de5894d124d213d22a073
Diffstat (limited to 'keystone/token')
| -rw-r--r-- | keystone/token/__init__.py | 2 | ||||
| -rw-r--r-- | keystone/token/controllers.py | 4 |
2 files changed, 3 insertions, 3 deletions
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 |
