From 74c631c6dae08d463f0d4c3953a1addcb187d090 Mon Sep 17 00:00:00 2001 From: kong wei 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 --- client/escalatorclient/common/http.py | 6 +++--- client/escalatorclient/common/https.py | 2 +- client/escalatorclient/common/utils.py | 6 +++--- client/escalatorclient/openstack/common/apiclient/base.py | 2 +- client/escalatorclient/openstack/common/apiclient/client.py | 4 ++-- client/escalatorclient/openstack/common/apiclient/utils.py | 4 ++-- client/escalatorclient/shell.py | 4 ++-- client/escalatorclient/v1/shell.py | 2 +- client/escalatorclient/v1/versions.py | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'client') 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 -- cgit 1.2.3-korg