Merge remote branch 'simplegeo/master'

Author: brosner

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.")
 
@@ -320,7 +325,12 @@ def get_parameter(self, parameter):
     def get_normalized_parameters(self):
         """Return a string that contains the parameters that must be signed."""
         items = [(k, v) for k, v in self.items() if k != 'oauth_signature']
-        return urllib.urlencode(sorted(items))
+        encoded_str = urllib.urlencode(sorted(items))
+        # Encode signature parameters per Oauth Core 1.0 protocol
+        # spec draft 7, section 3.6
+        # (http://tools.ietf.org/html/draft-hammer-oauth-07#section-3.6)
+        # Spaces must be encoded with "%20" instead of "+"
+        return encoded_str.replace('+', '%20')
 
     def sign_request(self, signature_method, consumer, token):
         """Set the signature parameter to the result of sign."""
@@ -435,7 +445,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 +577,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
 

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name="oauth2",
-      version="1.0.0",
+      version="1.0.2",
       description="Library for OAuth version 1.0a.",
       author="Joe Stump",
       author_email="joe@simplegeo.com",

tests/test_oauth.py

@@ -28,6 +28,14 @@
 import urllib
 import urlparse
 
+
+# Fix for python2.5 compatibility
+try:
+    from urlparse import parse_qs, parse_qsl
+except ImportError:
+    from cgi import parse_qs, parse_qsl
+
+
 class TestError(unittest.TestCase):
     def test_message(self):
         try:
@@ -90,7 +98,7 @@ def test_basic(self):
         self.assertRaises(ValueError, lambda: oauth.Consumer(None, 'dasf'))
 
     def test_str(self):
-        res = dict(urlparse.parse_qsl(str(self.consumer)))
+        res = dict(parse_qsl(str(self.consumer)))
         self.assertTrue('oauth_consumer_key' in res)
         self.assertTrue('oauth_consumer_secret' in res)
         self.assertEquals(res['oauth_consumer_key'], self.consumer.key)
@@ -319,7 +327,7 @@ def test_to_postdata(self):
 
         req = oauth.Request("GET", realm, params)
 
-        self.assertEquals(params, dict(urlparse.parse_qsl(req.to_postdata())))
+        self.assertEquals(params, dict(parse_qsl(req.to_postdata())))
 
     def test_to_url(self):
         url = "http://sp.example.com/"
@@ -341,8 +349,8 @@ def test_to_url(self):
         self.assertEquals(exp.netloc, res.netloc) 
         self.assertEquals(exp.path, res.path) 
 
-        a = urlparse.parse_qs(exp.query)
-        b = urlparse.parse_qs(res.query)
+        a = parse_qs(exp.query)
+        b = parse_qs(res.query)
         self.assertEquals(a, b) 
 
     def test_get_normalized_parameters(self):
@@ -360,7 +368,7 @@ def test_get_normalized_parameters(self):
 
         req = oauth.Request("GET", url, params)
 
-        res = dict(urlparse.parse_qsl(req.get_normalized_parameters()))
+        res = dict(parse_qsl(req.get_normalized_parameters()))
 
         foo = params.copy()
         del foo['oauth_signature']
@@ -428,7 +436,7 @@ def test_from_request(self):
         qs = urllib.urlencode(params)
         req = oauth.Request.from_request("GET", url, query_string=qs)
 
-        exp = urlparse.parse_qs(qs, keep_blank_values=False)
+        exp = parse_qs(qs, keep_blank_values=False)
         for k, v in exp.iteritems():
             exp[k] = urllib.unquote(v[0])
 
@@ -710,8 +718,8 @@ def test_access_token_post(self):
 
         self.assertEquals(int(resp['status']), 200)
 
-        res = dict(urlparse.parse_qsl(content))
-        self.assertTrue('oauth_token_key' in res)
+        res = dict(parse_qsl(content))
+        self.assertTrue('oauth_token' in res)
         self.assertTrue('oauth_token_secret' in res)
 
     def _two_legged(self, method):
@@ -732,4 +740,3 @@ def test_two_legged_get(self):
         """A test of a two-legged OAuth GET request."""
         resp, content = self._two_legged("GET")
         self.assertEquals(int(resp['status']), 200)
-