E58A added http_method to helper method for non-GET · ptarjan/python-oauth@4749abb · GitHub
[go: up one dir, main page]

Skip to content

Commit 4749abb

Browse files
committed
added http_method to helper method for non-GET
1 parent b235442 commit 4749abb

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

oauth/helper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ def refresh(self, user):
6767
user.save()
6868
return True
6969

70-
def sign_url(self, url, user, *args, **kwargs):
70+
def sign_url(self, url, user, http_method=None, *args, **kwargs):
7171
if not isinstance(user, self.db.User) : user = self.db.User.get(user)
7272

7373
access_token = user.get_access_token()
7474
request = oauth.OAuthRequest.from_consumer_and_token(
75-
self.consumer, token=access_token, http_url=url, parameters=kwargs
75+
self.consumer, token=access_token, http_url=url, http_method=http_method, parameters=kwargs
7676
)
7777
request.sign_request(self.signature_method_hmac_sha1, self.consumer, access_token)
7878
return request.to_url()

oauth/oauth.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ class OAuthRequest(object):
182182
http_url = None
183183
version = VERSION
184184

185-
def __init__(self, http_method=HTTP_METHOD, http_url=None, parameters=None):
186-
self.http_method = http_method
185+
def __init__(self, http_method=None, http_url=None, parameters=None):
186+
self.http_method = http_method or HTTP_METHOD
187187
self.http_url = http_url
188188
self.parameters = parameters or {}
189189

@@ -315,10 +315,12 @@ def from_request(http_method, http_url, headers=None, parameters=None,
315315
from_request = staticmethod(from_request)
316316

317317
def from_consumer_and_token(oauth_consumer, token=None,
318-
callback=None, verifier=None, http_method=HTTP_METHOD,
318+
callback=None, verifier=None, http_method=None,
319319
http_url=None, parameters=None):
320320
if not parameters:
321321
parameters = {}
322+
if not http_method:
323+
http_method=HTTP_METHOD
322324

323325
defaults = {
324326
'oauth_consumer_key': oauth_consumer.key,
@@ -346,10 +348,12 @@ def from_consumer_and_token(oauth_consumer, token=None,
346348
return OAuthRequest(http_method, http_url, parameters)
347349
from_consumer_and_token = staticmethod(from_consumer_and_token)
348350

349-
def from_token_and_callback(token, callback=None, http_method=HTTP_METHOD,
351+
def from_token_and_callback(token, callback=None, http_method=None,
350352
http_url=None, parameters=None):
351353
if not parameters:
352354
parameters = {}
355+
if not http_method:
356+
http_method=HTTP_METHOD
353357

354358
parameters['oauth_token'] = token.key
355359

0 commit comments

Comments
 (0)
0