Merge lp:~stefanor/launchpadlib/bug-643699 into lp:launchpadlib

[Stefano Rivera]

[r=benji,bug=643699] Add a delay before attempting to launch browser (landed for stefanor)

As I've taken over Debian maintainance of this package, I should help out in it's upstream merge requests too.

This supersedes https://code.launchpad.net/~dktrkranz/launchpadlib/bug-643699/+merge/78650

[Benji York (benji)]

Thanks for the branch. It looks good.

I suspect an incoming signal can cause the select to return before TIMEOUT and with an empty rlist, but that should be rare and would only cause a shorter than usual delay, so I wouldn't add any code to compensate for that possibility.

Would you like for me to land this branch for you?

review: Approve (code)

[Stefano Rivera (stefanor)]

Yes please, thanks.

=== modified file 'src/launchpadlib/credentials.py'
--- src/launchpadlib/credentials.py	2011-12-05 18:53:25 +0000
+++ src/launchpadlib/credentials.py	2012-05-03 15:20:25 +0000
@@ -31,7 +31,9 @@
 from cStringIO import StringIO
 import httplib2
 import os
+from select import select
 import stat
+from sys import stdin
 import time
 from urllib import urlencode
 from urlparse import urljoin
@@ -530,7 +532,17 @@
     themselves.
     """
 
-    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..."
+    WAITING_FOR_USER = (
+        "The authorization page:\n"
+        " (%s)\n"
+        "should be opening in your browser. Use your browser to authorize\n"
+        "this program to access Launchpad on your behalf.")
+    TIMEOUT_MESSAGE = "Press Enter to continue or wait (%d) seconds..."
+    TIMEOUT = 5
+    WAITING_FOR_LAUNCHPAD = (
+            "Waiting to hear from Launchpad about your decision...")
+    TERMINAL_BROWSERS = ('www-browser', 'links', 'links2', 'lynx',
+                         'elinks', 'elinks-lite', 'netrik', 'w3m')
 
     def __init__(self, service_root, application_name, consumer_name=None,
                  credential_save_failed=None, allow_access_levels=None):
@@ -566,8 +578,26 @@
         """Have the end-user authorize the token in their browser."""
 
         authorization_url = self.authorization_url(request_token)
-        webbrowser.open(authorization_url)
         self.output(self.WAITING_FOR_USER % authorization_url)
+
+        try:
+            browser = webbrowser.get().basename
+            console_browser = browser in self.TERMINAL_BROWSERS
+        except webbrowser.Error:
+            browser = None
+            console_browser = False
+
+        if console_browser:
+            self.output(self.TIMEOUT_MESSAGE % self.TIMEOUT)
+            # Wait a little time before attempting to launch browser,
+            # give users the chance to press a key to skip it anyway.
+            rlist, _, _ = select([stdin], [], [], self.TIMEOUT)
+            if rlist:
+                stdin.readline()
+
+        self.output(self.WAITING_FOR_LAUNCHPAD)
+        if browser is not None:
+            webbrowser.open(authorization_url)
         while credentials.access_token is None:
             time.sleep(access_token_poll_time)
             try: