Merge lp:~jamalta/gwibber/397297 into lp:gwibber/1.2

[Jamal Fanaian]

[Alexander Sack (asac)]

please remove the commented code, e.g.:
  #def get_auth(self):
  ...

review: Needs Resubmitting

[lp:~jamalta/gwibber/397297]

349. By Jamal Fanaian on 2009-07-12

Removed commented get_auth blocks

[Jamal Fanaian (jamalta)]

Sorry about that, I must have forgotten to push the changes when you asked
last week. I have pushed the changes now and they appear to be there. Do I
need to resubmit my merge proposal?

Jamal Fanaian
407.479.7533
http://jamalfanaian.com

On Sun, Jul 12, 2009 at 5:27 PM, Alexander Sack <email address hidden> wrote:

> Review: Resubmit
> please remove the commented code, e.g.:
> #def get_auth(self):
> ...
>
> --
> https://code.edge.launchpad.net/~jamalfanaian/gwibber/397297/+merge/8544<https://code.edge.launchpad.net/%7Ejamalfanaian/gwibber/397297/+merge/8544>
> You are the owner of lp:~jamalfanaian/gwibber/397297.
>

Unmerged revisions

349. By Jamal Fanaian on 2009-07-12

Removed commented get_auth blocks

348. By Jamal Fanaian on 2009-07-09

Provided the fix with using HTTPBasicAuth object to the laconica client

347. By Jamal Fanaian on 2009-07-09

The issue was resolved by using an urllib2.HTTPBasicAuthHandler to do authentication instead of passing the authentication header to urllib2.Request. Fixed the issue for twitter and identica.

=== modified file 'gwibber/microblog/identica.py'
--- gwibber/microblog/identica.py	2009-06-21 01:17:53 +0000
+++ gwibber/microblog/identica.py	2009-07-09 19:19:50 +0000
@@ -122,16 +122,23 @@
   def __init__(self, acct):
     self.account = acct
 
-  def get_auth(self):
-    return "Basic %s" % base64.encodestring(
-      ("%s:%s" % (self.account["username"], self.account["private:password"]))).strip()
+  #def get_auth(self):
+    #return "Basic %s" % base64.encodestring(
+      #("%s:%s" % (self.account["username"], self.account["private:password"]))).strip()
 
   def public_enabled(self):
     return self.account["public_enabled"]
 
   def connect(self, url, data = None):
+    # Set up urllib2 authentication
+    password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
+    password_mgr.add_password(None, url, 
+      self.account["username"], self.account["private:password"])
+    urllib2.install_opener(urllib2.build_opener(
+      urllib2.HTTPBasicAuthHandler(password_mgr)))
+
     return urllib2.urlopen(urllib2.Request(
-      url, data, {"Authorization": self.get_auth()})).read()
+      url, data)).read()
 
   def get_messages(self):
     return simplejson.loads(self.connect(
 
=== modified file 'gwibber/microblog/laconica.py'
--- gwibber/microblog/laconica.py	2009-06-21 00:04:28 +0000
+++ gwibber/microblog/laconica.py	2009-07-09 19:19:50 +0000
@@ -127,13 +127,21 @@
     if self.account["allow_insecure"]: return "http://" + d + path
     return "https://" + d + path
 
-  def get_auth(self):
-    return "Basic %s" % base64.encodestring(
-      ("%s:%s" % (self.account["username"], self.account["private:password"]))).strip()
+  #def get_auth(self):
+    #return "Basic %s" % base64.encodestring(
+      #("%s:%s" % (self.account["username"], self.account["private:password"]))).strip()
 
   def connect(self, url, data = None):
-    return urllib2.urlopen(urllib2.Request(
-      self.url(url), data, {"Authorization": self.get_auth()}))
+    url = self.url(url)
+
+    # Set up urllib2 authentication
+    password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
+    password_mgr.add_password(None, url, 
+      self.account["username"], self.account["private:password"])
+    urllib2.install_opener(urllib2.build_opener(
+      urllib2.HTTPBasicAuthHandler(password_mgr)))
+
+    return urllib2.urlopen(urllib2.Request(url, data))
 
   def get_messages(self):
     return simplejson.load(self.connect("/api/statuses/friends_timeline.json"))
 
=== modified file 'gwibber/microblog/twitter.py'
--- gwibber/microblog/twitter.py	2009-06-21 01:17:53 +0000
+++ gwibber/microblog/twitter.py	2009-07-09 19:19:50 +0000
@@ -159,13 +159,20 @@
       self.account["username"] != None and \
       self.account["private:password"] != None
 
-  def get_auth(self):
-    return "Basic %s" % base64.encodestring(
-      ("%s:%s" % (self.account["username"], self.account["private:password"]))).strip()
+  #def get_auth(self):
+    #return "Basic %s" % base64.encodestring(
+      #("%s:%s" % (self.account["username"], self.account["private:password"]))).strip()
 
   def connect(self, url, data = None):
+    # Set up urllib2 authentication
+    password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
+    password_mgr.add_password(None, url, 
+      self.account["username"], self.account["private:password"])
+    urllib2.install_opener(urllib2.build_opener(
+      urllib2.HTTPBasicAuthHandler(password_mgr)))
+
     return urllib2.urlopen(urllib2.Request(
-      url, data, headers = {"Authorization": self.get_auth()})).read()
+      url, data)).read()
 
   def get_messages(self):
     return simplejson.loads(self.connect(