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
diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py
index 131b241..2ed4fc8 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 896de81..34e1fe8 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 ff99c15..53bcfa6 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 c2d767a..e398792 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 8d758b1..429afbf 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 b404597..ce67e85 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 67b129c..c054b23 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 b61f286..f1965bc 100755
--- a/tempest/cmd/verify_tempest_config.py
+++ b/tempest/cmd/verify_tempest_config.py
@@ -18,10 +18,10 @@
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 ee07e73..fb5958c 100644
--- a/tempest/common/glance_http.py
+++ b/tempest/common/glance_http.py
@@ -23,13 +23,12 @@
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 6a1af6c..95c05d7 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 eaa894d..0e02bbc 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 cd35e7f..d3846a8 100644
--- a/tempest/thirdparty/boto/test.py
+++ b/tempest/thirdparty/boto/test.py
@@ -17,7 +17,6 @@
import logging as orig_logging
import os
import re
-import urlparse
import boto
from boto import ec2
@@ -25,7 +24,7 @@
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