"Updating samples to reflect recent changes."

AndyDiamondstein · AndyDiamondstein · commit 83232fe3fdab · 2015-10-15T13:04:22.000-04:00
diff --git a/python/set_watermark.py b/python/set_watermark.py
@@ -14,16 +14,15 @@
 from apiclient.errors import HttpError
 from oauth2client.file import Storage
 from oauth2client.client import flow_from_clientsecrets
-from oauth2client.tools import run
-from optparse import OptionParser
+from oauth2client.tools import argparser, run_flow
 
 
 # The CLIENT_SECRETS_FILE variable specifies the name of a file that contains
 
 # the OAuth 2.0 information for this application, including its client_id and
 # client_secret. You can acquire an OAuth 2.0 client ID and client secret from
-# the {{ Google Cloud Console }} at
-# {{ https://cloud.google.com/console }}.
+# the Google Developers Console at
+#   https://console.developers.google.com/project/_/apiui/credential
 # Please ensure that you have enabled the YouTube Data API for your project.
 # For more information about using OAuth2 to access the YouTube Data API, see:
 #   https://developers.google.com/youtube/v3/guides/authentication
@@ -45,16 +44,16 @@
 To make this sample run you will need to populate the client_secrets.json file
 found at:
    %s
-with information from the APIs Console
-https://developers.google.com/console
+with information from the Developers Console
+https://console.developers.google.com
 
 For more information about the client_secrets.json file format, please visit:
 https://developers.google.com/api-client-library/python/guide/aaa_client_secrets
 """ % os.path.abspath(os.path.join(os.path.dirname(__file__),
                                    CLIENT_SECRETS_FILE))
 
 # Authorize the request and store authorization credentials.
-def get_authenticated_service():
+def get_authenticated_service(args):
   flow = flow_from_clientsecrets(CLIENT_SECRETS_FILE,
     scope=YOUTUBE_READ_WRITE_SCOPE,
     message=MISSING_CLIENT_SECRETS_MESSAGE)
@@ -63,7 +62,7 @@ def get_authenticated_service():
   credentials = storage.get()
 
   if credentials is None or credentials.invalid:
-    credentials = run(flow, storage)
+    credentials = run_flow(flow, storage, args)
 
   return build(YOUTUBE_API_SERVICE_NAME, YOUTUBE_API_VERSION,
     http=credentials.authorize(httplib2.Http()))
@@ -76,38 +75,37 @@ def set_watermark(youtube, channel_id, file, metadata):
     youtube.watermarks().set(
       channelId=channel_id,
       media_body=file,
-      body=metadata, 
+      body=metadata,
     ).execute()
   except HttpError as e:
     print "Error while setting watermark: %s" % e.content
     raise e
 
 
 if __name__ == "__main__":
-  parser = OptionParser()
   # The "channelid" option specifies the YouTube channel ID that uniquely
   # identifies the channel for which the watermark image is being updated.
-  parser.add_option("--channelid", dest="channelid",
+  argparser.add_argument("--channelid", dest="channelid",
     help="Required; ID for channel that is having its watermark updated.")
   # The "file" option specifies the path to the image being uploaded.
-  parser.add_option("--file", dest="file",
+  argparser.add_argument("--file", dest="file",
     help="Required; path to watermark image file.")
   # The "metadata" option specifies the JSON for the watermark resource
   # provided with the request.
-  parser.add_option("--metadata", dest="metadata",
+  argparser.add_argument("--metadata", dest="metadata",
     help="Required; watermark metadata in JSON format.")
-  (options, args) = parser.parse_args()
-  
-  if not options.channelid:
-    parser.print_help()
+  args = argparser.parse_args()
+
+  if not args.channelid:
+    argparser.print_help()
     exit()
 
-  youtube = get_authenticated_service()
+  youtube = get_authenticated_service(args)
 
-  if not options.file or not os.path.exists(options.file):
+  if not args.file or not os.path.exists(args.file):
     exit("Please specify a valid file using the --file= parameter.")
-  if not options.metadata:
+  if not args.metadata:
     exit("Please specify watermark metadata using the --metadata= parameter.")
-  set_watermark(youtube, options.channelid, options.file,
-                json.loads(options.metadata))
+  set_watermark(youtube, args.channelid, args.file,
+                json.loads(args.metadata))
   print "The watermark was successfully set."
