Use six to call raw_input for Python 3 support

In Python 3 `raw_input` was renamed to `input`. Start to use the
compatibility library to call the function.

https://pythonhosted.org/six/#module-six.moves
This commit is contained in:
Keith Maxwell
2015-01-25 13:02:29 +00:00
parent 26d6429f53
commit 1fc21c4b8d
3 changed files with 6 additions and 3 deletions

View File

@@ -23,6 +23,7 @@ import sys
import webbrowser
import gflags
from six.moves import input
from oauth2client import client
from oauth2client import util
@@ -147,7 +148,7 @@ def run(flow, storage, http=None):
print('Failed to find "code" in the query parameters of the redirect.')
sys.exit('Try running with --noauth_local_webserver.')
else:
code = raw_input('Enter verification code: ').strip()
code = input('Enter verification code: ').strip()
try:
credential = flow.step2_exchange(code, http=http)

View File

@@ -30,6 +30,7 @@ import sys
from six.moves import BaseHTTPServer
from six.moves import urllib
from six.moves import input
from oauth2client import client
from oauth2client import util
@@ -216,7 +217,7 @@ def run_flow(flow, storage, flags, http=None):
print('Failed to find "code" in the query parameters of the redirect.')
sys.exit('Try running with --noauth_local_webserver.')
else:
code = raw_input('Enter verification code: ').strip()
code = input('Enter verification code: ').strip()
try:
credential = flow.step2_exchange(code, http=http)

View File

@@ -3,6 +3,7 @@
# See: https://developers.google.com/accounts/docs/OAuth2ForDevices
import httplib2
from six.moves import input
from oauth2client.client import OAuth2WebServerFlow
from googleapiclient.discovery import build
@@ -18,7 +19,7 @@ flow_info = flow.step1_get_device_and_user_codes()
print "Enter the following code at %s: %s" % (flow_info.verification_url,
flow_info.user_code)
print "Then press Enter."
raw_input()
input()
# Step 2: get credentials
# https://developers.google.com/accounts/docs/OAuth2ForDevices#obtainingatoken