diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-27 20:03:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-27 20:03:06 +0000 |
| commit | 6e4d6923cd4c7f5f9b4fd5f2a13190b9154f4f5a (patch) | |
| tree | 0337c24798fd12f3d3f31b8fb60b7ef380d90bea /openstackclient | |
| parent | efee80d631b9814b85f7060d3550a3750da2a0e8 (diff) | |
| parent | 575dcdfc8ef6d24ecb75663eb94d549a8beb30fe (diff) | |
| download | python-openstackclient-6e4d6923cd4c7f5f9b4fd5f2a13190b9154f4f5a.tar.gz | |
Merge "Remove oslo serialization requirement"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/common/test_clientmanager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openstackclient/tests/common/test_clientmanager.py b/openstackclient/tests/common/test_clientmanager.py index 26cf4967..4e2f46b4 100644 --- a/openstackclient/tests/common/test_clientmanager.py +++ b/openstackclient/tests/common/test_clientmanager.py @@ -12,12 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. # + +import json as jsonutils import mock from requests_mock.contrib import fixture from keystoneclient.auth.identity import v2 as auth_v2 from keystoneclient import service_catalog -from oslo_serialization import jsonutils from openstackclient.api import auth from openstackclient.api import auth_plugin |