X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/568331a954966fe0a980523b98f5195cc1026c5c..6af9fa5fb1f61fd4a2f65caf5cc10946f5f278c8:/twitter/oauth.py diff --git a/twitter/oauth.py b/twitter/oauth.py index 61b771d..32504d4 100644 --- a/twitter/oauth.py +++ b/twitter/oauth.py @@ -19,7 +19,9 @@ class OAuth(Auth): def encode_params(self, base_url, method, params): params = params.copy() - params['oauth_token'] = self.token + if self.token: + params['oauth_token'] = self.token + params['oauth_consumer_key'] = self.consumer_key params['oauth_signature_method'] = 'HMAC-SHA1' params['oauth_version'] = '1.0' @@ -33,8 +35,8 @@ class OAuth(Auth): message = '&'.join( urllib.quote(i, '') for i in [method.upper(), base_url, enc_params]) - signature = hmac.new(key, message, hashlib.sha1 - ).digest().encode('base64')[:-1] + signature = hmac.new( + key, message, hashlib.sha1).digest().encode('base64')[:-1] return enc_params + "&" + "oauth_signature=" + urllib.quote(signature, '') def generate_headers(self):