summaryrefslogtreecommitdiff
path: root/keystoneclient/v3
diff options
context:
space:
mode:
authorSteve Martinelli <stevemar@ca.ibm.com>2014-10-14 17:49:17 -0400
committerSteve Martinelli <stevemar@ca.ibm.com>2014-10-15 04:25:50 +0000
commit802301ca1763043bf699a52043504ab71a4dbb3b (patch)
treeca19bdc3eec296eda4721f92946525edc71856fb /keystoneclient/v3
parent89dc951f7d5a603f0c34b7c2cb9f7d26d73d9916 (diff)
downloadpython-keystoneclient-802301ca1763043bf699a52043504ab71a4dbb3b.tar.gz
Use oslo.utils and oslo.serialization
Left timeutils and strutils in openstack/common since they are used in openstack/common/apiclient and memorycache. Change-Id: Idb5f09c159d907dfba84cd1f7501f650318af7d9
Diffstat (limited to 'keystoneclient/v3')
-rw-r--r--keystoneclient/v3/client.py3
-rw-r--r--keystoneclient/v3/contrib/trusts.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/keystoneclient/v3/client.py b/keystoneclient/v3/client.py
index a271db3..1967e8e 100644
--- a/keystoneclient/v3/client.py
+++ b/keystoneclient/v3/client.py
@@ -15,10 +15,11 @@
import logging
+from oslo.serialization import jsonutils
+
from keystoneclient.auth.identity import v3 as v3_auth
from keystoneclient import exceptions
from keystoneclient import httpclient
-from keystoneclient.openstack.common import jsonutils
from keystoneclient.v3.contrib import endpoint_filter
from keystoneclient.v3.contrib import endpoint_policy
from keystoneclient.v3.contrib import federation
diff --git a/keystoneclient/v3/contrib/trusts.py b/keystoneclient/v3/contrib/trusts.py
index ed199e6..70e9d8e 100644
--- a/keystoneclient/v3/contrib/trusts.py
+++ b/keystoneclient/v3/contrib/trusts.py
@@ -10,9 +10,10 @@
# License for the specific language governing permissions and limitations
# under the License.
+from oslo.utils import timeutils
+
from keystoneclient import base
from keystoneclient import exceptions
-from keystoneclient.openstack.common import timeutils
class Trust(base.Resource):