Merge "Drop implementation to keep compatibility with Python 2.5"

Author: Zuul

troveclient/client.py

@@ -40,11 +40,6 @@
 except ImportError:
     import simplejson as json
 
-# Python 2.5 compat fix
-if not hasattr(urlparse, 'parse_qsl'):
-    import cgi
-    urlparse.parse_qsl = cgi.parse_qsl
-
 osprofiler_web = importutils.try_import("osprofiler.web")