added compatibility for older versions of python which don't have urlparse.parse_qs

Author: muffinresearch

oauth2/__init__.py

@@ -30,6 +30,11 @@
 import binascii
 import httplib2
 
+try:
+    from urlparse import parse_qs, parse_qsl
+except ImportError:
+    from cgi import parse_qs, parse_qsl
+
 
 VERSION = '1.0' # Hi Blaine!
 HTTP_METHOD = 'GET'
@@ -192,7 +197,7 @@ def from_string(s):
         if not len(s):
             raise ValueError("Invalid parameter string.")
 
-        params = urlparse.parse_qs(s, keep_blank_values=False)
+        params = parse_qs(s, keep_blank_values=False)
         if not len(params):
             raise ValueError("Invalid parameter string.")
 
@@ -435,7 +440,7 @@ def _split_header(header):
     @staticmethod
     def _split_url_string(param_str):
         """Turn URL string into parameters."""
-        parameters = urlparse.parse_qs(param_str, keep_blank_values=False)
+        parameters = parse_qs(param_str, keep_blank_values=False)
         for k, v in parameters.iteritems():
             parameters[k] = urllib.unquote(v[0])
         return parameters
@@ -567,10 +572,10 @@ def request(self, uri, method="GET", body=None, headers=None,
             headers = {}
 
         if body and method == "POST":
-            parameters = dict(urlparse.parse_qsl(body))
+            parameters = dict(parse_qsl(body))
         elif method == "GET":
             parsed = urlparse.urlparse(uri)
-            parameters = urlparse.parse_qs(parsed.query)     
+            parameters = parse_qs(parsed.query)     
         else:
             parameters = None