From cc99324694b684019929ae249fbc661f82a7d0f2 Mon Sep 17 00:00:00 2001
From: Brant Knudson <bknudson@us.ibm.com>
Date: Sun, 31 Jan 2016 08:51:51 -0600
Subject: [PATCH] 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
---
 keystoneclient/httpclient.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py
index 12864226e..fae52f95e 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