From 74c631c6dae08d463f0d4c3953a1addcb187d090 Mon Sep 17 00:00:00 2001
From: kong wei <kong.wei2@zte.com.cn>
Date: Fri, 3 Mar 2017 16:55:59 +0000
Subject: 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>
---
 client/escalatorclient/common/http.py  | 6 +++---
 client/escalatorclient/common/https.py | 2 +-
 client/escalatorclient/common/utils.py | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'client/escalatorclient/common')

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
-- 
cgit 1.2.3-korg