summaryrefslogtreecommitdiffstats
path: root/client/escalatorclient
diff options
context:
space:
mode:
authorkong wei <kong.wei2@zte.com.cn>2017-03-03 16:55:59 +0000
committerkong wei <kong.wei2@zte.com.cn>2017-03-03 16:55:59 +0000
commit74c631c6dae08d463f0d4c3953a1addcb187d090 (patch)
treeb1feebd61bf662b1759c3d3a272884e3803083d5 /client/escalatorclient
parent71d4f906c1a52f5dcba114ff8aa70148dafffd24 (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')
-rw-r--r--client/escalatorclient/common/http.py6
-rw-r--r--client/escalatorclient/common/https.py2
-rw-r--r--client/escalatorclient/common/utils.py6
-rw-r--r--client/escalatorclient/openstack/common/apiclient/base.py2
-rw-r--r--client/escalatorclient/openstack/common/apiclient/client.py4
-rw-r--r--client/escalatorclient/openstack/common/apiclient/utils.py4
-rw-r--r--client/escalatorclient/shell.py4
-rw-r--r--client/escalatorclient/v1/shell.py2
-rw-r--r--client/escalatorclient/v1/versions.py4
9 files changed, 17 insertions, 17 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
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 _
diff --git a/client/escalatorclient/shell.py b/client/escalatorclient/shell.py
index 6aa17f8..782106c 100644
--- a/client/escalatorclient/shell.py
+++ b/client/escalatorclient/shell.py
@@ -29,8 +29,8 @@ from os.path import expanduser
import sys
import traceback
-from oslo.utils import encodeutils
-from oslo.utils import importutils
+from oslo_utils import encodeutils
+from oslo_utils import importutils
import six.moves.urllib.parse as urlparse
import escalatorclient
diff --git a/client/escalatorclient/v1/shell.py b/client/escalatorclient/v1/shell.py
index ab02c9a..401ad76 100644
--- a/client/escalatorclient/v1/shell.py
+++ b/client/escalatorclient/v1/shell.py
@@ -17,7 +17,7 @@ from __future__ import print_function
import copy
import functools
-from oslo.utils import strutils
+from oslo_utils import strutils
import escalatorclient.v1.versions
from escalatorclient.common import utils
diff --git a/client/escalatorclient/v1/versions.py b/client/escalatorclient/v1/versions.py
index 6fe2f74..143c4c6 100644
--- a/client/escalatorclient/v1/versions.py
+++ b/client/escalatorclient/v1/versions.py
@@ -15,8 +15,8 @@
import copy
-from oslo.utils import encodeutils
-from oslo.utils import strutils
+from oslo_utils import encodeutils
+from oslo_utils import strutils
import six
import six.moves.urllib.parse as urlparse