summaryrefslogtreecommitdiffstats
path: root/keystone/trust
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2013-05-23 15:36:48 -0500
committerGerrit Code Review <review@openstack.org>2013-05-24 01:25:32 +0000
commit0be3c0e99786a8ad250484748f4af9c6b07ae191 (patch)
treebba51e72be883e237f629ffc3409e7598c166791 /keystone/trust
parent0f6f386c74754bc2e94a177d00d74bc074eba2fd (diff)
downloadkeystone-0be3c0e99786a8ad250484748f4af9c6b07ae191.tar.gz
keystone-0be3c0e99786a8ad250484748f4af9c6b07ae191.tar.xz
keystone-0be3c0e99786a8ad250484748f4af9c6b07ae191.zip
imports not in alphabetical order (flake8 H306)
Change-Id: I0f6c5fc27b0bb2da553e9345a8ac4949ce46e685
Diffstat (limited to 'keystone/trust')
-rw-r--r--keystone/trust/backends/kvs.py3
-rw-r--r--keystone/trust/controllers.py6
2 files changed, 4 insertions, 5 deletions
diff --git a/keystone/trust/backends/kvs.py b/keystone/trust/backends/kvs.py
index 40b7c9e4..96995e37 100644
--- a/keystone/trust/backends/kvs.py
+++ b/keystone/trust/backends/kvs.py
@@ -19,10 +19,9 @@ only to be used for testing purposes
"""
import copy
-
from keystone.common import kvs
-from keystone.openstack.common import timeutils
from keystone import exception
+from keystone.openstack.common import timeutils
from keystone import trust
diff --git a/keystone/trust/controllers.py b/keystone/trust/controllers.py
index 1d7dce6c..f918ed47 100644
--- a/keystone/trust/controllers.py
+++ b/keystone/trust/controllers.py
@@ -1,11 +1,11 @@
import uuid
-from keystone import config
-from keystone import exception
-from keystone import identity
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 import identity
from keystone.openstack.common import timeutils