Use six.moves.urllib.parse instead of urlparse
To keep Python 3.x compatibility, use six.moves.urllib.parse to replace urlparse. Partial-Bug: #1279611 Change-Id: Ibe5e028acd12e8d753d95cfd9c3f63072278b120
This commit is contained in:
parent
e98576efae
commit
0b3fbf88dd
|
@ -18,10 +18,10 @@
|
|||
"""
|
||||
|
||||
import copy
|
||||
import urlparse
|
||||
|
||||
import eventlet
|
||||
from oslo.config import cfg
|
||||
import six.moves.urllib.parse as urlparse
|
||||
from webob.exc import (HTTPNotFound,
|
||||
HTTPConflict,
|
||||
HTTPBadRequest,
|
||||
|
|
|
@ -28,10 +28,10 @@ Keystone (an identity management system).
|
|||
> auth_plugin.management_url
|
||||
http://service_endpoint/
|
||||
"""
|
||||
import urlparse
|
||||
|
||||
import httplib2
|
||||
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from glance.common import exception
|
||||
from glance.openstack.common import jsonutils
|
||||
import glance.openstack.common.log as logging
|
||||
|
|
|
@ -25,7 +25,6 @@ import httplib
|
|||
import os
|
||||
import re
|
||||
import urllib
|
||||
import urlparse
|
||||
|
||||
try:
|
||||
from eventlet.green import socket, ssl
|
||||
|
@ -38,6 +37,8 @@ try:
|
|||
SENDFILE_SUPPORTED = True
|
||||
except ImportError:
|
||||
SENDFILE_SUPPORTED = False
|
||||
|
||||
import six.moves.urllib.parse as urlparse
|
||||
from six.moves import xrange
|
||||
|
||||
from glance.common import auth
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
"""Glance exception subclasses"""
|
||||
|
||||
import urlparse
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
_FATAL_EXCEPTION_FORMAT_ERRORS = False
|
||||
|
||||
|
|
|
@ -15,10 +15,9 @@
|
|||
|
||||
"""Storage preference based location strategy module"""
|
||||
|
||||
import urlparse
|
||||
|
||||
from oslo.config import cfg
|
||||
import six
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
store_type_opts = [
|
||||
cfg.ListOpt("store_type_preference",
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
# under the License.
|
||||
|
||||
import urllib
|
||||
import urlparse
|
||||
|
||||
import six.moves.urllib.parse as urlparse
|
||||
import sqlalchemy
|
||||
|
||||
from glance.common import exception
|
||||
|
|
|
@ -28,9 +28,9 @@ Fixes bug #1081043
|
|||
"""
|
||||
import types # noqa
|
||||
import urllib
|
||||
import urlparse
|
||||
|
||||
from oslo.config import cfg
|
||||
import six.moves.urllib.parse as urlparse
|
||||
import sqlalchemy
|
||||
|
||||
from glance.common import crypt
|
||||
|
|
|
@ -20,9 +20,9 @@ A simple filesystem-backed store
|
|||
import errno
|
||||
import hashlib
|
||||
import os
|
||||
import urlparse
|
||||
|
||||
from oslo.config import cfg
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from glance.common import exception
|
||||
from glance.common import utils
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
from __future__ import absolute_import
|
||||
|
||||
from oslo.config import cfg
|
||||
import urlparse
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from glance.common import exception
|
||||
from glance.openstack.common import excutils
|
||||
|
|
|
@ -14,7 +14,8 @@
|
|||
# under the License.
|
||||
|
||||
import httplib
|
||||
import urlparse
|
||||
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from glance.common import exception
|
||||
import glance.openstack.common.log as logging
|
||||
|
|
|
@ -37,7 +37,7 @@ that it stores in its storage backends. It **may contain** security
|
|||
credentials and is **not** user-facing.
|
||||
"""
|
||||
|
||||
import urlparse
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from glance.common import exception
|
||||
import glance.openstack.common.log as logging
|
||||
|
|
|
@ -19,9 +19,9 @@ import hashlib
|
|||
import httplib
|
||||
import re
|
||||
import tempfile
|
||||
import urlparse
|
||||
|
||||
from oslo.config import cfg
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from glance.common import exception
|
||||
from glance.common import utils
|
||||
|
|
|
@ -21,9 +21,9 @@ import hashlib
|
|||
import httplib
|
||||
import math
|
||||
import urllib
|
||||
import urlparse
|
||||
|
||||
from oslo.config import cfg
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from glance.common import auth
|
||||
from glance.common import exception
|
||||
|
|
|
@ -18,10 +18,10 @@
|
|||
import hashlib
|
||||
import httplib
|
||||
import urllib
|
||||
import urlparse
|
||||
|
||||
import netaddr
|
||||
from oslo.config import cfg
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from glance.common import exception
|
||||
import glance.openstack.common.log as logging
|
||||
|
|
|
@ -32,9 +32,9 @@ import socket
|
|||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
import urlparse
|
||||
|
||||
import fixtures
|
||||
import six.moves.urllib.parse as urlparse
|
||||
from sqlalchemy import create_engine
|
||||
import testtools
|
||||
|
||||
|
|
|
@ -24,9 +24,9 @@ import ConfigParser
|
|||
import os
|
||||
import os.path
|
||||
import urllib
|
||||
import urlparse
|
||||
|
||||
import oslo.config.cfg
|
||||
import six.moves.urllib.parse as urlparse
|
||||
import testtools
|
||||
|
||||
import glance.store.s3
|
||||
|
|
|
@ -28,10 +28,10 @@ import random
|
|||
import string
|
||||
import StringIO
|
||||
import urllib
|
||||
import urlparse
|
||||
import uuid
|
||||
|
||||
import oslo.config.cfg
|
||||
import six.moves.urllib.parse as urlparse
|
||||
import testtools
|
||||
|
||||
from glance.common import exception
|
||||
|
|
|
@ -30,12 +30,12 @@ import datetime
|
|||
import os
|
||||
import pickle
|
||||
import subprocess
|
||||
import urlparse
|
||||
import uuid
|
||||
|
||||
from migrate.versioning import api as migration_api
|
||||
from migrate.versioning.repository import Repository
|
||||
from oslo.config import cfg
|
||||
import six.moves.urllib.parse as urlparse
|
||||
from six.moves import xrange
|
||||
import sqlalchemy
|
||||
|
||||
|
|
Loading…
Reference in New Issue