diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-26 22:53:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-26 22:53:37 +0000 |
| commit | d30f782fbe6324b3a7ef34e274fd4db5d6c0e78a (patch) | |
| tree | f284f869bdafc83cfcbb2d644484e92c506e6ac0 /openstackclient | |
| parent | a00cc815b70b17df561a7610ac1408f417ba3f8f (diff) | |
| parent | 1186cb4c9f1a35a9f82e3e68612b31759a47a152 (diff) | |
| download | python-openstackclient-d30f782fbe6324b3a7ef34e274fd4db5d6c0e78a.tar.gz | |
Merge "change oslo namespace to avoid warning"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/api/auth.py | 2 | ||||
| -rw-r--r-- | openstackclient/common/utils.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/common/test_clientmanager.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/api/auth.py b/openstackclient/api/auth.py index 14bb01d7..0ed34e02 100644 --- a/openstackclient/api/auth.py +++ b/openstackclient/api/auth.py @@ -19,7 +19,7 @@ import logging from six.moves.urllib import parse as urlparse import stevedore -from oslo.config import cfg +from oslo_config import cfg from keystoneclient.auth import base from keystoneclient.auth.identity.generic import password as ksc_password diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py index 01a40e74..c800b4cf 100644 --- a/openstackclient/common/utils.py +++ b/openstackclient/common/utils.py @@ -21,7 +21,7 @@ import os import six import time -from oslo.utils import importutils +from oslo_utils import importutils from openstackclient.common import exceptions diff --git a/openstackclient/tests/common/test_clientmanager.py b/openstackclient/tests/common/test_clientmanager.py index 3b2b976b..58878e10 100644 --- a/openstackclient/tests/common/test_clientmanager.py +++ b/openstackclient/tests/common/test_clientmanager.py @@ -17,7 +17,7 @@ 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 oslo_serialization import jsonutils from openstackclient.api import auth from openstackclient.common import clientmanager |