diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py index e84e9dbd..f746db58 100644 --- a/glanceclient/common/http.py +++ b/glanceclient/common/http.py @@ -17,8 +17,8 @@ import copy import logging import socket -from oslo.utils import importutils -from oslo.utils import netutils +from oslo_utils import importutils +from oslo_utils import netutils import requests try: from requests.packages.urllib3.exceptions import ProtocolError @@ -37,7 +37,7 @@ if not hasattr(parse, 'parse_qsl'): import cgi parse.parse_qsl = cgi.parse_qsl -from oslo.utils import encodeutils +from oslo_utils import encodeutils from glanceclient.common import https from glanceclient.common.utils import safe_header diff --git a/glanceclient/common/https.py b/glanceclient/common/https.py index 186b3ac8..0635dd4c 100644 --- a/glanceclient/common/https.py +++ b/glanceclient/common/https.py @@ -26,7 +26,7 @@ except ImportError: from urllib3 import connectionpool from urllib3 import poolmanager -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six from glanceclient.common import utils diff --git a/glanceclient/common/utils.py b/glanceclient/common/utils.py index 5841ffe0..a8c7faa4 100644 --- a/glanceclient/common/utils.py +++ b/glanceclient/common/utils.py @@ -24,7 +24,7 @@ import sys import threading import uuid -from oslo.utils import importutils +from oslo_utils import importutils import six if os.name == 'nt': @@ -32,8 +32,8 @@ if os.name == 'nt': else: msvcrt = None -from oslo.utils import encodeutils -from oslo.utils import strutils +from oslo_utils import encodeutils +from oslo_utils import strutils import prettytable from glanceclient import exc diff --git a/glanceclient/openstack/common/apiclient/base.py b/glanceclient/openstack/common/apiclient/base.py index 5817d3bf..b208b062 100644 --- a/glanceclient/openstack/common/apiclient/base.py +++ b/glanceclient/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/glanceclient/openstack/common/apiclient/client.py b/glanceclient/openstack/common/apiclient/client.py index 0a11f8a6..ec2150ee 100644 --- a/glanceclient/openstack/common/apiclient/client.py +++ b/glanceclient/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 glanceclient.openstack.common._i18n import _ diff --git a/glanceclient/openstack/common/apiclient/utils.py b/glanceclient/openstack/common/apiclient/utils.py index 44209f53..7110d926 100644 --- a/glanceclient/openstack/common/apiclient/utils.py +++ b/glanceclient/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 glanceclient.openstack.common._i18n import _ diff --git a/glanceclient/shell.py b/glanceclient/shell.py index b52361d5..b19d63b7 100644 --- a/glanceclient/shell.py +++ b/glanceclient/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 glanceclient diff --git a/glanceclient/v1/images.py b/glanceclient/v1/images.py index 857b546e..36315b23 100644 --- a/glanceclient/v1/images.py +++ b/glanceclient/v1/images.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 diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py index c14820e9..c4e53dc0 100644 --- a/glanceclient/v1/shell.py +++ b/glanceclient/v1/shell.py @@ -19,8 +19,8 @@ import copy import functools import six -from oslo.utils import encodeutils -from oslo.utils import strutils +from oslo_utils import encodeutils +from oslo_utils import strutils from glanceclient.common import progressbar from glanceclient.common import utils diff --git a/glanceclient/v2/images.py b/glanceclient/v2/images.py index df122fa7..b1f3237f 100644 --- a/glanceclient/v2/images.py +++ b/glanceclient/v2/images.py @@ -15,7 +15,7 @@ import json -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six from six.moves.urllib import parse import warlock diff --git a/glanceclient/v2/metadefs.py b/glanceclient/v2/metadefs.py index 56468faf..b6ba492f 100644 --- a/glanceclient/v2/metadefs.py +++ b/glanceclient/v2/metadefs.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six from six.moves.urllib import parse import warlock diff --git a/glanceclient/v2/tasks.py b/glanceclient/v2/tasks.py index 51217ea4..37801915 100644 --- a/glanceclient/v2/tasks.py +++ b/glanceclient/v2/tasks.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.utils import encodeutils +from oslo_utils import encodeutils import six import warlock