Update oauth_dance.py

[z_archive/twitter.git] / twitter / oauth_dance.py

diff --git a/twitter/oauth_dance.py b/twitter/oauth_dance.py
index 1e398496cabbd55d6038e8cf7ca63af1bff184ad..43b88d0ea6e01a46c793408102e845094ed8e58f 100644 (file)
--- a/twitter/oauth_dance.py
+++ b/twitter/oauth_dance.py
@@ -2,7 +2,6 @@ from __future__ import print_function
 
 import webbrowser
 import time
-import json
 
 from .api import Twitter, json
 from .oauth import OAuth, write_token_file
@@ -26,8 +25,7 @@ def oauth2_dance(consumer_key, consumer_secret, token_filename=None):
         auth=OAuth2(consumer_key=consumer_key, consumer_secret=consumer_secret),
         format="",
         api_version="")
-    token = json.loads(twitter.oauth2.token(grant_type="client_credentials")
-        .encode("utf8"))["access_token"]
+    token = json.loads(twitter.oauth2.token(grant_type="client_credentials"))["access_token"]
     if token_filename:
         write_bearer_token_file(token)
     return token
@@ -50,7 +48,7 @@ def oauth_dance(app_name, consumer_key, consumer_secret, token_filename=None):
         auth=OAuth('', '', consumer_key, consumer_secret),
         format='', api_version=None)
     oauth_token, oauth_token_secret = parse_oauth_tokens(
-        twitter.oauth.request_token())
+        twitter.oauth.request_token(oauth_callback="oob"))
     print("""
 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