Merge git://github.com/muitocomplicado/twitter into new_patches

[z_archive/twitter.git] / twitter / api.py

diff --git a/twitter/api.py b/twitter/api.py
index 5472583fb3385e9c9077238f0f9b7cd3f8186fe7..f3d661299ad760b8e8a3f53fbfee5a2b5eb4aee2 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -1,5 +1,5 @@
 
-from base64 import b64encode
+from base64 import encodestring
 from urllib import urlencode
 
 import urllib2
@@ -73,8 +73,8 @@ class TwitterCall(object):
         if (self.agent):
             headers["X-Twitter-Client"] = self.agent
         if (self.username):
-            headers["Authorization"] = "Basic " + b64encode("%s:%s" %(
-                self.username, self.password))
+            headers["Authorization"] = "Basic " + encodestring("%s:%s" %(
+                self.username, self.password)).strip('\n')
 
         secure_str = ''
         if self.secure: