summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-27 10:03:27 +0000
committerGerrit Code Review <review@openstack.org>2015-04-27 10:03:27 +0000
commitc307ffc525d896e2071319c8067aec805804f92b (patch)
tree9a94f505fc4478ebc17893c5860145837349f320
parent7e40436193abbeb66e435b170c80ed50caf159e1 (diff)
parent90d4c3fcf730c1e64cb3e77b0ecc1276baa1cc71 (diff)
downloadtempest-lib-c307ffc525d896e2071319c8067aec805804f92b.tar.gz
Merge "Switch from using custom urlparse import logic to six"0.5.0
-rw-r--r--tempest_lib/auth.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/tempest_lib/auth.py b/tempest_lib/auth.py
index dca496d..290bb13 100644
--- a/tempest_lib/auth.py
+++ b/tempest_lib/auth.py
@@ -17,13 +17,10 @@ import abc
import copy
import datetime
import re
-try:
- import urllib.parse as urlparse
-except ImportError:
- import urlparse
from oslo_log import log as logging
import six
+from six.moves.urllib import parse as urlparse
from tempest_lib import exceptions
from tempest_lib.services.identity.v2 import token_client as json_v2id