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

native_client_sdk/src/build_tools/build_app.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
+import argparse
 import json
-import optparse
 import os
 import re
 import sys
 
 if sys.version_info < (2, 6, 0):

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

bump all of these to 2.7.0

[Sam Clegg, 2014/11/15 02:28:25]

Split this into a separate change

   sys.stderr.write("python 2.6 or later is required run this script\n")
   sys.exit(1)
 
 import buildbot_common
 import build_projects
 import build_version
 import easy_template
 import parse_dsc
 
 from build_paths import SDK_SRC_DIR, OUT_DIR, SDK_RESOURCE_DIR
@@ skipping 47 matching lines @@
 def GetStrip(pepperdir, platform, arch, toolchain):
   base_arch = {'x86_32': 'x86', 'x86_64': 'x86', 'arm': 'arm'}[arch]
   bin_dir = os.path.join(pepperdir, 'toolchain',
                          '%s_%s_%s' % (platform, base_arch, toolchain), 'bin')
   strip_prefix = {'x86_32': 'i686', 'x86_64': 'x86_64', 'arm': 'arm'}[arch]
   strip_name = '%s-nacl-strip' % strip_prefix
   return os.path.join(bin_dir, strip_name)
 
 
 def main(args):
-  parser = optparse.OptionParser()
-  parser.add_option('-c', '--channel',
+  parser = argparse.ArgumentParser()
+  parser.add_argument('-c', '--channel',
       help='Channel to display in the name of the package.')
 
   # To setup bash completion for this command first install optcomplete
   # and then add this line to your .bashrc:
   #  complete -F _optcomplete build_app.py
   try:
     import optcomplete
     optcomplete.autocomplete(parser)
   except ImportError:
     pass
 
-  options, args = parser.parse_args(args[1:])
+  options = parser.parse_args(args)
 
   if options.channel:
     if options.channel not in ('Dev', 'Beta'):
       parser.error('Unknown channel: %s' % options.channel)
 
   toolchains = ['newlib', 'glibc']
 
   pepper_ver = str(int(build_version.ChromeMajorVersion()))
   pepperdir = os.path.join(OUT_DIR, 'pepper_' + pepper_ver)
   app_dir = os.path.join(OUT_DIR, 'naclsdk_app')
@@ skipping 70 matching lines @@
       template_dict)
 
   app_zip = os.path.join(app_dir, 'examples.zip')
   os.chdir(app_examples_dir)
   oshelpers.Zip([app_zip, '-r', '*'])
 
   return 0
 
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv))
+  sys.exit(main(sys.argv[1:]))