Remove prompt for default project ID

third_party/gsutil/oauth2_plugin/oauth2_helper.py

 # Copyright 2011 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 58 matching lines @@
   client_id = config.get('OAuth2', 'client_id', GSUTIL_CLIENT_ID)
   client_secret = config.get(
       'OAuth2', 'client_secret', GSUTIL_CLIENT_NOTSOSECRET)
 
   return oauth2_client.OAuth2Client(
       oauth2_client.OAuth2Provider(
           provider_label, provider_authorization_uri, provider_token_uri),
       client_id, client_secret,
       proxy=proxy, access_token_cache=token_cache)
 
-def OAuth2ApprovalFlow(oauth2_client, scopes, launch_browser=False):
+def OAuth2ApprovalFlow(oauth2_client, scopes):
   approval_url = oauth2_client.GetAuthorizationUri(OOB_REDIRECT_URI, scopes)
-  if launch_browser:
-    sys.stdout.write(
-        'Attempting to launch a browser with the OAuth2 approval dialog at '
-        'URL: %s\n\n'
-        '[Note: due to a Python bug, you may see a spurious error message "object is not\n'
-        'callable [...] in [...] Popen.__del__" which can be ignored.]\n\n' % approval_url)
-  else:
-    sys.stdout.write(
-        'Please navigate your browser to the following URL:\n%s\n' %
-        approval_url)
+  sys.stdout.write(
+      'Please navigate your browser to the following URL:\n%s\n\n' %
+      approval_url)
 
-  sys.stdout.write(

[M-A Ruel, 2014/04/02 21:29:43]

You could only delete this line and use launch_browser=False, this would reduce
the diff.

[Ryan Tseng, 2014/04/02 22:07:03]

Done.

-      'In your browser you should see a page that requests you to authorize '
-      'gsutil to access\nGoogle Cloud Storage on your behalf. After you '
-      'approve, an authorization code will be displayed.\n\n')
-  if (launch_browser and
-      not webbrowser.open(approval_url, new=1, autoraise=True)):
-    sys.stdout.write(
-        'Launching browser appears to have failed; please navigate a browser '
-        'to the following URL:\n%s\n' % approval_url)
-  # Short delay; webbrowser.open on linux insists on printing out a message

[M-A Ruel, 2014/04/02 21:29:43]

and still deleting this sleep() call.

-  # which we don't want to run into the prompt for the auth code.
-  time.sleep(2)
   code = raw_input('Enter the authorization code: ')
 
   refresh_token, access_token = oauth2_client.ExchangeAuthorizationCode(
       code, OOB_REDIRECT_URI, scopes)
 
   return refresh_token