From: Mike Verdone <redacted>
Date: Wed, 2 Mar 2011 21:16:48 +0000 (+0100)
Subject: Use base64 library instead of .encode("base64")
X-Git-Tag: twitter-1.5.1~5
X-Git-Url: https://jfr.im/git/z_archive/twitter.git/commitdiff_plain/12fc19275ae3e22ae6eda83f4bc35ce01f98f42e?hp=01591361f984b8a2a926f6df2c981aa3c76d9d68

Use base64 library instead of .encode("base64")

Conflicts:

	twitter/oauth.py
---

diff --git a/twitter/oauth.py b/twitter/oauth.py
index ed15492..96cc4e6 100644
--- a/twitter/oauth.py
+++ b/twitter/oauth.py
@@ -6,7 +6,7 @@ from time import time
 import urllib
 import hashlib
 import hmac
-
+import base64
 
 def write_token_file(filename, oauth_token, oauth_token_secret):
     """
@@ -59,8 +59,9 @@ 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 = (base64.b64encode(hmac.new(
+                    key.encode('ascii'), message.encode('ascii'), hashlib.sha1)
+                                      .digest()))
         return enc_params + "&" + "oauth_signature=" + urllib.quote(signature, '')
 
     def generate_headers(self):