From deda02331474632c47b88c166241cd65b2952269 Mon Sep 17 00:00:00 2001 From: wanghong <w.wanghong@huawei.com> Date: Fri, 17 Oct 2014 11:36:53 +0800 Subject: [PATCH] use jsonutils in oslo.serialization instead of keystoneclient keystoneclient/openstack/common/jsonutils.py is removed in this patch https://review.openstack.org/#/c/128454/ Now, we should use jsonutils in oslo.serialization package. Change-Id: I7c8e8e6d5dffa85244368fd578616c9b19f4fd21 --- openstackclient/tests/common/test_clientmanager.py | 2 +- requirements.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openstackclient/tests/common/test_clientmanager.py b/openstackclient/tests/common/test_clientmanager.py index 18461fb7e8..9e9749c6a4 100644 --- a/openstackclient/tests/common/test_clientmanager.py +++ b/openstackclient/tests/common/test_clientmanager.py @@ -16,8 +16,8 @@ import mock from requests_mock.contrib import fixture from keystoneclient.auth.identity import v2 as auth_v2 -from keystoneclient.openstack.common import jsonutils from keystoneclient import service_catalog +from oslo.serialization import jsonutils from openstackclient.api import auth from openstackclient.common import clientmanager diff --git a/requirements.txt b/requirements.txt index 3fcde32154..54ea795079 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ Babel>=1.3 cliff>=1.7.0 # Apache-2.0 oslo.i18n>=1.0.0 # Apache-2.0 oslo.utils>=1.0.0 # Apache-2.0 +oslo.serialization>=1.0.0 # Apache-2.0 python-glanceclient>=0.14.0 python-keystoneclient>=0.11.1 python-novaclient>=2.18.0