From: Mike Verdone <redacted>
Date: Sun, 11 Jul 2010 21:15:15 +0000 (+0200)
Subject: If the cmdline tool cannot create a browser window it will print the URL to the screen.
X-Git-Tag: twitter-1.4~3
X-Git-Url: https://jfr.im/git/z_archive/twitter.git/commitdiff_plain/25feb1180341458e2772eb6b9f944f290b641424

If the cmdline tool cannot create a browser window it will print the URL to the screen.
---

diff --git a/twitter/oauth_dance.py b/twitter/oauth_dance.py
index dcbcc6a..877da8b 100644
--- a/twitter/oauth_dance.py
+++ b/twitter/oauth_dance.py
@@ -29,13 +29,22 @@ In the web browser window that opens please choose to Allow
 access. Copy the PIN number that appears on the next page and paste or
 type it here:
 """
-    webbrowser.open(
-        'http://api.twitter.com/oauth/authorize?oauth_token=' +
-        oauth_token)
-    time.sleep(2) # Sometimes the last command can print some
-                  # crap. Wait a bit so it doesn't mess up the next
-                  # prompt.
-    oauth_verifier = raw_input("Please type the PIN: ").strip()
+    oauth_url = ('http://api.twitter.com/oauth/authorize?oauth_token=' +
+                 oauth_token)
+    try:
+        r = webbrowser.open(oauth_url)
+        time.sleep(2) # Sometimes the last command can print some
+                      # crap. Wait a bit so it doesn't mess up the next
+                      # prompt.
+        if not r:
+            raise Exception()
+    except:
+        print """
+Uh, I couldn't open a browser on your computer. Please go here to get
+your PIN:
+
+""" + oauth_url
+    oauth_verifier = raw_input("Please enter the PIN: ").strip()
     twitter = Twitter(
         auth=OAuth(
             oauth_token, oauth_token_secret, consumer_key, consumer_secret),