From f077dd26d3228e96fcf9702f5eb51fe12f04bdd2 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Thu, 23 Apr 2015 09:37:41 -0400 Subject: Switch all uses of urlparse to import from six As part of enabling python3 support in tempest we need to be able to handle urlparse usage in both python2 and python3. Six provies a compat layer for doing this, so this commit moves all uses of urllparse to get it through six. Change-Id: Ic9c15d90fd3b8413fec4d01a070cc167f7536e62 --- tempest/api/compute/servers/test_server_actions.py | 2 +- tempest/api/messaging/test_claims.py | 2 +- tempest/api/object_storage/test_container_sync.py | 2 +- tempest/api/object_storage/test_object_formpost.py | 2 +- tempest/api/object_storage/test_object_formpost_negative.py | 2 +- tempest/api/object_storage/test_object_temp_url.py | 2 +- tempest/api/object_storage/test_object_temp_url_negative.py | 2 +- tempest/cmd/verify_tempest_config.py | 2 +- tempest/common/glance_http.py | 3 +-- tempest/services/botoclients.py | 8 ++++---- tempest/services/object_storage/object_client.py | 3 ++- tempest/thirdparty/boto/test.py | 3 +-- 12 files changed, 16 insertions(+), 17 deletions(-) diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py index 131b24166..2ed4fc815 100644 --- a/tempest/api/compute/servers/test_server_actions.py +++ b/tempest/api/compute/servers/test_server_actions.py @@ -15,8 +15,8 @@ import base64 import logging -import urlparse +from six.moves.urllib import parse as urlparse from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest_lib import exceptions as lib_exc diff --git a/tempest/api/messaging/test_claims.py b/tempest/api/messaging/test_claims.py index 896de81d2..34e1fe85b 100644 --- a/tempest/api/messaging/test_claims.py +++ b/tempest/api/messaging/test_claims.py @@ -14,8 +14,8 @@ # limitations under the License. import logging -import urlparse +from six.moves.urllib import parse as urlparse from tempest_lib.common.utils import data_utils from tempest_lib import decorators diff --git a/tempest/api/object_storage/test_container_sync.py b/tempest/api/object_storage/test_container_sync.py index ff99c156e..53bcfa639 100644 --- a/tempest/api/object_storage/test_container_sync.py +++ b/tempest/api/object_storage/test_container_sync.py @@ -14,8 +14,8 @@ # under the License. import time -import urlparse +from six.moves.urllib import parse as urlparse from tempest_lib.common.utils import data_utils from tempest_lib import decorators import testtools diff --git a/tempest/api/object_storage/test_object_formpost.py b/tempest/api/object_storage/test_object_formpost.py index c2d767a04..e39879227 100644 --- a/tempest/api/object_storage/test_object_formpost.py +++ b/tempest/api/object_storage/test_object_formpost.py @@ -15,8 +15,8 @@ import hashlib import hmac import time -import urlparse +from six.moves.urllib import parse as urlparse from tempest_lib.common.utils import data_utils from tempest.api.object_storage import base diff --git a/tempest/api/object_storage/test_object_formpost_negative.py b/tempest/api/object_storage/test_object_formpost_negative.py index 8d758b1d7..429afbf3b 100644 --- a/tempest/api/object_storage/test_object_formpost_negative.py +++ b/tempest/api/object_storage/test_object_formpost_negative.py @@ -15,8 +15,8 @@ import hashlib import hmac import time -import urlparse +from six.moves.urllib import parse as urlparse from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc diff --git a/tempest/api/object_storage/test_object_temp_url.py b/tempest/api/object_storage/test_object_temp_url.py index b404597c4..ce67e85a8 100644 --- a/tempest/api/object_storage/test_object_temp_url.py +++ b/tempest/api/object_storage/test_object_temp_url.py @@ -15,8 +15,8 @@ import hashlib import hmac import time -import urlparse +from six.moves.urllib import parse as urlparse from tempest_lib.common.utils import data_utils from tempest.api.object_storage import base diff --git a/tempest/api/object_storage/test_object_temp_url_negative.py b/tempest/api/object_storage/test_object_temp_url_negative.py index 67b129c7a..c054b2346 100644 --- a/tempest/api/object_storage/test_object_temp_url_negative.py +++ b/tempest/api/object_storage/test_object_temp_url_negative.py @@ -15,8 +15,8 @@ import hashlib import hmac import time -import urlparse +from six.moves.urllib import parse as urlparse from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc diff --git a/tempest/cmd/verify_tempest_config.py b/tempest/cmd/verify_tempest_config.py index b61f286ee..f1965bc57 100755 --- a/tempest/cmd/verify_tempest_config.py +++ b/tempest/cmd/verify_tempest_config.py @@ -18,10 +18,10 @@ import argparse import json import os import sys -import urlparse import httplib2 from six import moves +from six.moves.urllib import parse as urlparse from tempest import clients from tempest.common import credentials diff --git a/tempest/common/glance_http.py b/tempest/common/glance_http.py index ee07e7366..fb5958ca0 100644 --- a/tempest/common/glance_http.py +++ b/tempest/common/glance_http.py @@ -23,13 +23,12 @@ import posixpath import re import socket import struct -import urlparse - import OpenSSL from oslo_log import log as logging import six from six import moves +from six.moves.urllib import parse as urlparse from tempest_lib import exceptions as lib_exc from tempest import exceptions as exc diff --git a/tempest/services/botoclients.py b/tempest/services/botoclients.py index 6a1af6ccc..95c05d7f5 100644 --- a/tempest/services/botoclients.py +++ b/tempest/services/botoclients.py @@ -15,15 +15,15 @@ import ConfigParser import contextlib -from tempest_lib import exceptions as lib_exc import types -import urlparse - -from tempest import config import boto import boto.ec2 import boto.s3.connection +from six.moves.urllib import parse as urlparse +from tempest_lib import exceptions as lib_exc + +from tempest import config CONF = config.CONF diff --git a/tempest/services/object_storage/object_client.py b/tempest/services/object_storage/object_client.py index eaa894d8d..0e02bbc22 100644 --- a/tempest/services/object_storage/object_client.py +++ b/tempest/services/object_storage/object_client.py @@ -15,7 +15,8 @@ import httplib import urllib -import urlparse + +from six.moves.urllib import parse as urlparse from tempest.common import service_client diff --git a/tempest/thirdparty/boto/test.py b/tempest/thirdparty/boto/test.py index cd35e7f0a..d3846a82f 100644 --- a/tempest/thirdparty/boto/test.py +++ b/tempest/thirdparty/boto/test.py @@ -17,7 +17,6 @@ import contextlib import logging as orig_logging import os import re -import urlparse import boto from boto import ec2 @@ -25,7 +24,7 @@ from boto import exception from boto import s3 from oslo_log import log as logging import six - +from six.moves.urllib import parse as urlparse from tempest_lib import exceptions as lib_exc import tempest.clients -- cgit v1.2.1