Added a parameters keyword argument to the Client method request() so that the oauth_callback parameter can easily be added to the initial token request as required by OAuth 1.0a. This also let django-piston 0.3 work correctly with python-oauth2 sample clients.

jskitz · Anthony Awtrey · commit 82f8b8d2b104 · 2011-04-26T23:11:13.000-04:00
diff --git a/oauth2/__init__.py b/oauth2/__init__.py
@@ -639,7 +639,7 @@ def set_signature_method(self, method):
         self.method = method
 
     def request(self, uri, method="GET", body='', headers=None, 
-        redirections=httplib2.DEFAULT_MAX_REDIRECTS, connection_type=None):
+        redirections=httplib2.DEFAULT_MAX_REDIRECTS, connection_type=None, parameters={}):
         DEFAULT_POST_CONTENT_TYPE = 'application/x-www-form-urlencoded'
 
         if not isinstance(headers, dict):
@@ -652,10 +652,9 @@ def request(self, uri, method="GET", body='', headers=None,
         is_form_encoded = \
             headers.get('Content-Type') == 'application/x-www-form-urlencoded'
 
+        parameters = parameters or {}
         if is_form_encoded and body:
-            parameters = parse_qs(body)
-        else:
-            parameters = None
+            parameters.update(parse_qs(body))
 
         req = Request.from_consumer_and_token(self.consumer, 
             token=self.token, http_method=method, http_url=uri, 
