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/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/common')
-rw-r--r-- | client/escalatorclient/common/http.py | 6 | ||||
-rw-r--r-- | client/escalatorclient/common/https.py | 2 | ||||
-rw-r--r-- | client/escalatorclient/common/utils.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/client/escalatorclient/common/http.py b/client/escalatorclient/common/http.py index e3e4b88..301eedb 100644 --- a/client/escalatorclient/common/http.py +++ b/client/escalatorclient/common/http.py @@ -16,12 +16,12 @@ import copy import logging import socket -from oslo.utils import encodeutils +from oslo_utils import encodeutils from escalatorclient.common import https from escalatorclient.common.utils import safe_header from escalatorclient import exc -from oslo.utils import importutils -from oslo.utils import netutils +from oslo_utils import importutils +from oslo_utils import netutils from simplejson import decoder import requests try: diff --git a/client/escalatorclient/common/https.py b/client/escalatorclient/common/https.py index 0008a84..55769a0 100644 --- a/client/escalatorclient/common/https.py +++ b/client/escalatorclient/common/https.py @@ -25,7 +25,7 @@ try: except ImportError: from urllib3 import connectionpool -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six # NOTE(jokke): simplified transition to py3, behaves like py2 xrange from six.moves import range diff --git a/client/escalatorclient/common/utils.py b/client/escalatorclient/common/utils.py index 6ebffe0..0156d31 100644 --- a/client/escalatorclient/common/utils.py +++ b/client/escalatorclient/common/utils.py @@ -23,13 +23,13 @@ import re import sys import threading import uuid -from oslo.utils import encodeutils -from oslo.utils import strutils +from oslo_utils import encodeutils +from oslo_utils import strutils import prettytable import six from escalatorclient import exc -from oslo.utils import importutils +from oslo_utils import importutils if os.name == 'nt': import msvcrt |