Merge "Change oslo.utils to oslo_utils"

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

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

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

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
 

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 _

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 _

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

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
 

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

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

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

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