diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-04 02:16:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-04 02:16:26 +0000 |
| commit | 033c30f10949cfe5c9e7901ac4fb9fe35e985162 (patch) | |
| tree | de4aacee25b73154525bf99279572aa8ccf3270f | |
| parent | 53de2007c7d4f30876c5810a7b9decaecbc92414 (diff) | |
| parent | cc99324694b684019929ae249fbc661f82a7d0f2 (diff) | |
| download | python-keystoneclient-033c30f10949cfe5c9e7901ac4fb9fe35e985162.tar.gz | |
Merge "Remove python 2.5 workaround"
| -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 ccb5f30..1e4f48f 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 @@ -50,11 +49,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 |