twitterbot oauth in progress

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index 980b754ba937c4a1716c034440563b36dbb8502e..e7a73cb3e856446de7ba3486d4da01b6e6445f7c 100644 (file)
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -447,15 +447,6 @@ class DoNothingAction(Action):
     def __call__(self, twitter, options):
         pass
 
-def parse_oauth_tokens(result):
-    for r in result.split('&'):
-        k, v = r.split('=')
-        if k == 'oauth_token':
-            oauth_token = v
-        elif k == 'oauth_token_secret':
-            oauth_token_secret = v
-    return oauth_token, oauth_token_secret
-
 actions = {
     'authorize' : DoNothingAction,
     'follow'    : FollowAction,

diff --git a/twitter/oauth_dance.py b/twitter/oauth_dance.py
index cffa624e4a08593143f686c0be3732aaded16e4a..dcbcc6ab5f40a7dd6b84c09a6cd151c7134de6ce 100644 (file)
--- a/twitter/oauth_dance.py
+++ b/twitter/oauth_dance.py
@@ -1,4 +1,6 @@
 
+import webbrowser
+import time
 
 from api import Twitter
 from oauth import OAuth, write_token_file
@@ -36,14 +38,23 @@ type it here:
     oauth_verifier = raw_input("Please type the PIN: ").strip()
     twitter = Twitter(
         auth=OAuth(
-            oauth_token, oauth_token_secret, CONSUMER_KEY, CONSUMER_SECRET),
+            oauth_token, oauth_token_secret, consumer_key, consumer_secret),
         format='')
     oauth_token, oauth_token_secret = parse_oauth_tokens(
         twitter.oauth.access_token(oauth_verifier=oauth_verifier))
     if token_filename:
         write_token_file(
             token_filename, oauth_token, oauth_token_secret)
-    print
-    print "That's it! Your authorization keys have been written to %s." % (
-        options['oauth_filename'])
+        print
+        print "That's it! Your authorization keys have been written to %s." % (
+            token_filename)
+    return oauth_token, oauth_token_secret
+
+def parse_oauth_tokens(result):
+    for r in result.split('&'):
+        k, v = r.split('=')
+        if k == 'oauth_token':
+            oauth_token = v
+        elif k == 'oauth_token_secret':
+            oauth_token_secret = v
     return oauth_token, oauth_token_secret