summaryrefslogtreecommitdiff
path: root/tempest/api/object_storage/test_object_temp_url_negative.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-27 18:09:47 +0000
committerGerrit Code Review <review@openstack.org>2015-04-27 18:09:47 +0000
commit693ed4f8c5ee762de937338eafbabf5bfaf4a11d (patch)
tree68fe3bdc38a91360bc3806d54f5cf9335f808b93 /tempest/api/object_storage/test_object_temp_url_negative.py
parentb53008d4eb394b2fe542325ac97e91c9aaee14d7 (diff)
parentf077dd26d3228e96fcf9702f5eb51fe12f04bdd2 (diff)
downloadtempest-693ed4f8c5ee762de937338eafbabf5bfaf4a11d.tar.gz
Merge "Switch all uses of urlparse to import from six"
Diffstat (limited to 'tempest/api/object_storage/test_object_temp_url_negative.py')
-rw-r--r--tempest/api/object_storage/test_object_temp_url_negative.py2
1 files changed, 1 insertions, 1 deletions
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