Merge "Change oslo.utils to oslo_utils"
This commit is contained in:
@@ -17,8 +17,8 @@ import copy
|
|||||||
import logging
|
import logging
|
||||||
import socket
|
import socket
|
||||||
|
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
from oslo.utils import netutils
|
from oslo_utils import netutils
|
||||||
import requests
|
import requests
|
||||||
try:
|
try:
|
||||||
from requests.packages.urllib3.exceptions import ProtocolError
|
from requests.packages.urllib3.exceptions import ProtocolError
|
||||||
@@ -37,7 +37,7 @@ if not hasattr(parse, 'parse_qsl'):
|
|||||||
import cgi
|
import cgi
|
||||||
parse.parse_qsl = cgi.parse_qsl
|
parse.parse_qsl = cgi.parse_qsl
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
|
|
||||||
from glanceclient.common import https
|
from glanceclient.common import https
|
||||||
from glanceclient.common.utils import safe_header
|
from glanceclient.common.utils import safe_header
|
||||||
|
@@ -26,7 +26,7 @@ except ImportError:
|
|||||||
from urllib3 import connectionpool
|
from urllib3 import connectionpool
|
||||||
from urllib3 import poolmanager
|
from urllib3 import poolmanager
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from glanceclient.common import utils
|
from glanceclient.common import utils
|
||||||
|
@@ -24,7 +24,7 @@ import sys
|
|||||||
import threading
|
import threading
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
if os.name == 'nt':
|
if os.name == 'nt':
|
||||||
@@ -32,8 +32,8 @@ if os.name == 'nt':
|
|||||||
else:
|
else:
|
||||||
msvcrt = None
|
msvcrt = None
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
from oslo.utils import strutils
|
from oslo_utils import strutils
|
||||||
import prettytable
|
import prettytable
|
||||||
|
|
||||||
from glanceclient import exc
|
from glanceclient import exc
|
||||||
|
@@ -40,7 +40,7 @@ Base utilities to build API operation managers and objects on top of.
|
|||||||
import abc
|
import abc
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
from oslo.utils import strutils
|
from oslo_utils import strutils
|
||||||
import six
|
import six
|
||||||
from six.moves.urllib import parse
|
from six.moves.urllib import parse
|
||||||
|
|
||||||
|
@@ -34,8 +34,8 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from glanceclient.openstack.common._i18n import _
|
from glanceclient.openstack.common._i18n import _
|
||||||
|
@@ -24,8 +24,8 @@
|
|||||||
#
|
#
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
from oslo.utils import uuidutils
|
from oslo_utils import uuidutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from glanceclient.openstack.common._i18n import _
|
from glanceclient.openstack.common._i18n import _
|
||||||
|
@@ -29,8 +29,8 @@ from os.path import expanduser
|
|||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
from oslo.utils import importutils
|
from oslo_utils import importutils
|
||||||
import six.moves.urllib.parse as urlparse
|
import six.moves.urllib.parse as urlparse
|
||||||
|
|
||||||
import glanceclient
|
import glanceclient
|
||||||
|
@@ -15,8 +15,8 @@
|
|||||||
|
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
from oslo.utils import strutils
|
from oslo_utils import strutils
|
||||||
import six
|
import six
|
||||||
import six.moves.urllib.parse as urlparse
|
import six.moves.urllib.parse as urlparse
|
||||||
|
|
||||||
|
@@ -19,8 +19,8 @@ import copy
|
|||||||
import functools
|
import functools
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
from oslo.utils import strutils
|
from oslo_utils import strutils
|
||||||
|
|
||||||
from glanceclient.common import progressbar
|
from glanceclient.common import progressbar
|
||||||
from glanceclient.common import utils
|
from glanceclient.common import utils
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
import six
|
import six
|
||||||
from six.moves.urllib import parse
|
from six.moves.urllib import parse
|
||||||
import warlock
|
import warlock
|
||||||
|
@@ -13,7 +13,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
import six
|
import six
|
||||||
from six.moves.urllib import parse
|
from six.moves.urllib import parse
|
||||||
import warlock
|
import warlock
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.utils import encodeutils
|
from oslo_utils import encodeutils
|
||||||
import six
|
import six
|
||||||
import warlock
|
import warlock
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user