diff options
| author |   kong wei <kong.wei2@zte.com.cn> | 2017-03-03 16:55:59 +0000 |
|---|---|---|
| committer | kong wei <kong.wei2@zte.com.cn> | 2017-03-03 16:55:59 +0000 |
| commit | 74c631c6dae08d463f0d4c3953a1addcb187d090 (patch) | |
| tree | b1feebd61bf662b1759c3d3a272884e3803083d5 /client/escalatorclient/openstack/common | |
| parent | 71d4f906c1a52f5dcba114ff8aa70148dafffd24 (diff) | |
Revert "escalator should use oslo.xxx instead of oslo-xxx"
This reverts commit 71d4f906c1a52f5dcba114ff8aa70148dafffd24.
Change-Id: I18a853c887b380b862554ff35ef8a8ddd76b5a58
Signed-off-by: Kong Wei<kong.wei2@zte.com.cn>
Diffstat (limited to 'client/escalatorclient/openstack/common')
3 files changed, 5 insertions, 5 deletions
diff --git a/client/escalatorclient/openstack/common/apiclient/base.py b/client/escalatorclient/openstack/common/apiclient/base.py index 128e964..eb7218b 100644 --- a/client/escalatorclient/openstack/common/apiclient/base.py +++ b/client/escalatorclient/openstack/common/apiclient/base.py @@ -40,7 +40,7 @@ Base utilities to build API operation managers and objects on top of. import abc import copy -from oslo.utils import strutils +from oslo_utils import strutils import six from six.moves.urllib import parse diff --git a/client/escalatorclient/openstack/common/apiclient/client.py b/client/escalatorclient/openstack/common/apiclient/client.py index 6d80e3c..d478989 100644 --- a/client/escalatorclient/openstack/common/apiclient/client.py +++ b/client/escalatorclient/openstack/common/apiclient/client.py @@ -34,8 +34,8 @@ try: except ImportError: import json -from oslo.utils import encodeutils -from oslo.utils import importutils +from oslo_utils import encodeutils +from oslo_utils import importutils import requests from escalatorclient.openstack.common._i18n import _ diff --git a/client/escalatorclient/openstack/common/apiclient/utils.py b/client/escalatorclient/openstack/common/apiclient/utils.py index b37e73b..c0f612a 100644 --- a/client/escalatorclient/openstack/common/apiclient/utils.py +++ b/client/escalatorclient/openstack/common/apiclient/utils.py @@ -24,8 +24,8 @@ # ######################################################################## -from oslo.utils import encodeutils -from oslo.utils import uuidutils +from oslo_utils import encodeutils +from oslo_utils import uuidutils import six from escalatorclient.openstack.common._i18n import _ |