Merge "Remove code needed for python2.5"

glanceclient/common/http.py

@@ -23,7 +23,6 @@ from oslo_utils import importutils
 from oslo_utils import netutils
 import requests
 import six
-from six.moves.urllib import parse
 import warnings
 
 try:
@@ -31,11 +30,6 @@ try:
 except ImportError:
     import simplejson as json
 
-# Python 2.5 compat fix
-if not hasattr(parse, 'parse_qsl'):
-    import cgi
-    parse.parse_qsl = cgi.parse_qsl
-
 from oslo_utils import encodeutils
 
 from glanceclient.common import utils