diff options
| author | Matthew Treinish <mtreinish@kortar.org> | 2015-04-23 09:24:59 -0400 |
|---|---|---|
| committer | Matthew Treinish <mtreinish@kortar.org> | 2015-04-23 09:24:59 -0400 |
| commit | 90d4c3fcf730c1e64cb3e77b0ecc1276baa1cc71 (patch) | |
| tree | 0d5cb50b555e8ebfbb390c5ff4fc2f5f0c8d02ec | |
| parent | 0b50366e654ca1fec76b6cf4e20f21db63695c80 (diff) | |
| download | tempest-lib-90d4c3fcf730c1e64cb3e77b0ecc1276baa1cc71.tar.gz | |
Switch from using custom urlparse import logic to six
This commit removes the try except logic in auth.py to import urlparse
on either python2 or python3 to use six instead. Six already provides
an interface to use urlparse the same way on either python2 or python3
which is a bit cleaner.
Change-Id: I964586af4b2df63ae81b09ac1c3f1397b0250b80
| -rw-r--r-- | tempest_lib/auth.py | 5 |
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 |