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