From: Mike Verdone <redacted>
Date: Mon, 4 Apr 2011 19:20:43 +0000 (+0200)
Subject: Fix oauth_dance function.
X-Git-Tag: twitter-1.6.1~3
X-Git-Url: https://jfr.im/git/z_archive/twitter.git/commitdiff_plain/ea5231b2fe0f40d87c9c7991b949c39c7cddd7e3?hp=249508919a85673ed16c9661815697aada5462b5

Fix oauth_dance function.
---

diff --git a/twitter/oauth_dance.py b/twitter/oauth_dance.py
index dace720..d6e93e3 100644
--- a/twitter/oauth_dance.py
+++ b/twitter/oauth_dance.py
@@ -1,10 +1,19 @@
 
+from __future__ import print_function
+
 import webbrowser
 import time
 
 from .api import Twitter
 from .oauth import OAuth, write_token_file
 
+try:
+    _input = raw_input
+except NameError:
+    _input = input
+
+
+
 def oauth_dance(app_name, consumer_key, consumer_secret, token_filename=None):
     """
     Perform the OAuth dance with some command-line prompts. Return the
@@ -21,7 +30,7 @@ def oauth_dance(app_name, consumer_key, consumer_secret, token_filename=None):
     print(("Hi there! We're gonna get you all set up to use %s." % app_name))
     twitter = Twitter(
         auth=OAuth('', '', consumer_key, consumer_secret),
-        format='')
+        format='', api_version=None)
     oauth_token, oauth_token_secret = parse_oauth_tokens(
         twitter.oauth.request_token())
     print("""
@@ -46,11 +55,11 @@ Uh, I couldn't open a browser on your computer. Please go here to get
 your PIN:
 
 """ + oauth_url)
-    oauth_verifier = input("Please enter the PIN: ").strip()
+    oauth_verifier = _input("Please enter the PIN: ").strip()
     twitter = Twitter(
         auth=OAuth(
             oauth_token, oauth_token_secret, consumer_key, consumer_secret),
-        format='')
+        format='', api_version=None)
     oauth_token, oauth_token_secret = parse_oauth_tokens(
         twitter.oauth.access_token(oauth_verifier=oauth_verifier))
     if token_filename: