summaryrefslogtreecommitdiff
path: root/keystoneclient/generic
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-10-14 11:16:42 -0700
committerClint Byrum <clint@fewbar.com>2013-11-14 22:33:43 -0800
commit43e278c8be05a25edd17729ee2ab3de2be8044fe (patch)
tree57009734e16e69055db62bb693fa7346edfb42ab /keystoneclient/generic
parent0abb189e4cf9fdc4c21eca4f516da5791f1281e9 (diff)
downloadpython-keystoneclient-43e278c8be05a25edd17729ee2ab3de2be8044fe.tar.gz
Fix python3 incompatible use of urlparse
Use six to make it work. While we're not yet able to gate keystoneclient on py33, we still need keystoneclient to work when keystoneclient is included in other libraries' test suites. This was discovered while working on python3 for python-tuskarclient. Note that together with I65c28896d1551fd537dd7774e87bc479a477a7ab keystoneclient can be used safely in python-tuskarclient's py33 tests. Closes-bug: #1239802 Change-Id: Ie6d31dc5fae7e63bb31a5192fa6765fe35dd026a
Diffstat (limited to 'keystoneclient/generic')
-rw-r--r--keystoneclient/generic/client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py
index a1f8072..c0f2b5f 100644
--- a/keystoneclient/generic/client.py
+++ b/keystoneclient/generic/client.py
@@ -16,7 +16,7 @@
# under the License.
import logging
-import urlparse
+from six.moves.urllib import parse as urlparse
from keystoneclient import exceptions
from keystoneclient import httpclient