diff options
author | Brant Knudson <bknudson@us.ibm.com> | 2016-01-31 08:51:51 -0600 |
---|---|---|
committer | Brant Knudson <bknudson@us.ibm.com> | 2016-01-31 08:51:51 -0600 |
commit | cc99324694b684019929ae249fbc661f82a7d0f2 (patch) | |
tree | da7a51ab639974a329ae4a89b7c0289c40904924 | |
parent | 5c936fabe1b6ae0acccdc2587d45fa7dd09de321 (diff) | |
download | python-keystoneclient-cc99324694b684019929ae249fbc661f82a7d0f2.tar.gz |
Remove python 2.5 workaround
keystoneclient doesn't support python 2.5 so remove this workaround
code. Messing with global variables is a mistake anyways.
Change-Id: I1567508cb1931b8c5365cfe6584e5a732c459db0
-rw-r--r-- | keystoneclient/httpclient.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py index 1286422..fae52f9 100644 --- a/keystoneclient/httpclient.py +++ b/keystoneclient/httpclient.py @@ -28,7 +28,6 @@ from oslo_serialization import jsonutils import pkg_resources from positional import positional import requests -from six.moves.urllib import parse as urlparse try: import pickle @@ -49,11 +48,6 @@ except (ImportError, pkg_resources.DistributionNotFound): keyring = None pickle = None -# Python 2.5 compat fix -if not hasattr(urlparse, 'parse_qsl'): - import cgi - urlparse.parse_qsl = cgi.parse_qsl - from keystoneclient import _discover from keystoneclient import access |