[NaCl SDK] Convert python scripts from optparse to argparse.

native_client_sdk/src/build_tools/update_nacl_manifest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Script that reads omahaproxy and gsutil to determine version of SDK to put
 in manifest.
 """
 
 # pylint is convinced the email module is missing attributes
 # pylint: disable=E1101
 
 import buildbot_common
 import csv
 import cStringIO
 import difflib
 import email
 import logging
 import logging.handlers
 import manifest_util
-import optparse
+import argparse

[binji, 2014/11/13 23:57:02]

sort

[Sam Clegg, 2014/11/30 17:55:11]

Done.

 import os
 import posixpath
 import re
 import smtplib
 import subprocess
 import sys
 import time
 import traceback
 import urllib2
 
@@ skipping 840 matching lines @@
   def write(self, s):
     self.written.write(s)
     if self.passthrough:
       self.passthrough.write(s)
 
   def getvalue(self):
     return self.written.getvalue()
 
 
 def main(args):
-  parser = optparse.OptionParser()
-  parser.add_option('--gsutil', help='path to gsutil.')
-  parser.add_option('-d', '--debug', help='run in debug mode.',
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--gsutil', help='path to gsutil.')
+  parser.add_argument('-d', '--debug', help='run in debug mode.',
       action='store_true')
-  parser.add_option('--mailfrom', help='email address of sender.')
-  parser.add_option('--mailto', help='send error mails to...', action='append')
-  parser.add_option('-n', '--dryrun', help="don't upload the manifest.",
+  parser.add_argument('--mailfrom', help='email address of sender.')
+  parser.add_argument('--mailto', help='send error mails to...',
+      action='append')
+  parser.add_argument('-n', '--dryrun', help="don't upload the manifest.",
       action='store_true')
-  parser.add_option('-v', '--verbose', help='print more diagnotic messages. '
+  parser.add_argument('-v', '--verbose', help='print more diagnotic messages. '
       'Use more than once for more info.',
       action='count')
-  parser.add_option('--log-file', metavar='FILE', help='log to FILE')
-  parser.add_option('--upload-log', help='Upload log alongside the manifest.',
-                    action='store_true')
-  parser.add_option('--bundle-version',
+  parser.add_argument('--log-file', metavar='FILE', help='log to FILE')
+  parser.add_argument('--upload-log', help='Upload log alongside the manifest.',
+      action='store_true')
+  parser.add_argument('--bundle-version',
       help='Manually set a bundle version. This can be passed more than once. '
       'format: --bundle-version pepper_24=24.0.1312.25', action='append')
-  options, args = parser.parse_args(args[1:])
+  options = parser.parse_args(args)
 
   if (options.mailfrom is None) != (not options.mailto):
     options.mailfrom = None
     options.mailto = None
     logger.warning('Disabling email, one of --mailto or --mailfrom '
         'was missing.\n')
 
   if options.verbose >= 2:
     logging.basicConfig(level=logging.DEBUG, filename=options.log_file)
   elif options.verbose:
@@ skipping 19 matching lines @@
 
       if options.upload_log:
         gsutil_logging_handler = GsutilLoggingHandler(delegate)
         logger.addHandler(gsutil_logging_handler)
 
       # Only look for naclports archives >= 27. The old ports bundles don't
       # include license information.
       extra_archives = [('naclports.tar.bz2', '27.0.0.0')]
       Run(delegate, ('mac', 'win', 'linux'), extra_archives,
           fixed_bundle_versions)
-      return 0
     except Exception:
       if options.mailfrom and options.mailto:
         traceback.print_exc()
         scriptname = os.path.basename(sys.argv[0])
         subject = '[%s] Failed to update manifest' % (scriptname,)
         text = '%s failed.\n\nSTDERR:\n%s\n' % (scriptname,
                                                 sys.stderr.getvalue())
         delegate.SendMail(subject, text)
         return 1
       else:
         raise
     finally:
       if options.upload_log:
         gsutil_logging_handler.upload()
   except manifest_util.Error as e:
     if options.debug:
       raise
     sys.stderr.write(str(e) + '\n')
     return 1
 
+  return 0
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv))
+  sys.exit(main(sys.argv[1:]))