Merge lp:~leonardr/launchpadlib/fix-token-authorization into lp:launchpadlib

[Leonard Richardson]

This branch fixes a couple of bugs introduced by my branch at https://code.edge.launchpad.net/~leonardr/launchpadlib/remove-broken-code/. I didn't catch the bugs earlier because they are in code that must be tested manually (since it opens a web browser and requires action within the browser), and I shamefully did not test that code manually.

Here's how to test:

>>> from launchpadlib.launchpad import Launchpad
>>> l = Launchpad.login_with("some random consumer key", "edge")

If your web browser opens, the code is working.

1. I restored the max_failed_attempts constructor argument to RequestTokenAuthorizationEngine, even though the only extant authorization engine (the one that opens a web browser) doesn't use it. We may be using this argument at some point in the future, and if we decide not to, that point (not now) is the appropriate time to formally deprecate it.

2. I replaced a call to open_page_in_user_browser (which I'd removed, as it was just a single-use wrapper around webbrowser.open, but I forgot to change the call site) with a call to webbrowser.open.

[Paul Hummer (rockstar)]

review: Approve

Unmerged revisions

=== modified file 'src/launchpadlib/credentials.py'
--- src/launchpadlib/credentials.py	2010-10-20 13:14:40 +0000
+++ src/launchpadlib/credentials.py	2010-10-26 17:49:45 +0000
@@ -205,12 +205,15 @@
     This authorizer simply opens up the end-user's web browser to a
     Launchpad URL and lets the end-user authorize the request token
     themselves.
+
+    :param max_failed_attempts: Unused by this token authorization
+    mechanism. Any value passed in will be ignored.
     """
 
     WAITING_FOR_USER = "The authorization page:\n (%s)\nshould be opening in your browser. Use your browser to authorize\nthis program to access Launchpad on your behalf. \n\nWaiting to hear from Launchpad about your decision..."
 
     def __init__(self, web_root, consumer_name, request_token,
-                 allow_access_levels=[], max_failed_attempts=3):
+                 allow_access_levels=[], max_failed_attempts=None):
         web_root = uris.lookup_web_root(web_root)
         page = "+authorize-token?oauth_token=%s" % request_token
         if len(allow_access_levels) > 0:
@@ -220,7 +223,7 @@
 
         super(AuthorizeRequestTokenWithBrowser, self).__init__(
             web_root, consumer_name, request_token,
-            allow_access_levels, max_failed_attempts)
+            allow_access_levels)
 
     def output(self, message):
         """Display a message.
@@ -232,7 +235,7 @@
         print message
 
     def __call__(self, credentials, web_root):
-        self.open_page_in_user_browser(self.authorization_url)
+        webbrowser.open(self.authorization_url)
         self.output(self.WAITING_FOR_USER % self.authorization_url)
         while credentials.access_token is None:
             time.sleep(access_token_poll_time)