openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Remove python 2.5 workaround"

Browse Source
This commit is contained in:
Jenkins
2016-02-04 02:16:26 +00:00
committed by Gerrit Code Review
parent 53de2007c7 cc99324694
commit 033c30f109
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keystoneclient/httpclient.py
View File

@@ -28,7 +28,6 @@ from oslo_serialization import jsonutils
import pkg_resources import pkg_resources
from positional import positional from positional import positional
import requests import requests
from six.moves.urllib import parse as urlparse
try: try:
import pickle import pickle
@@ -50,11 +49,6 @@ except (ImportError, pkg_resources.DistributionNotFound):
keyring = None keyring = None
pickle = 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 _discover
from keystoneclient import access from keystoneclient import access