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

native_client_sdk/src/build_tools/verify_filelist.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 optparse
+import argparse
 import os
 import re
 import sys
 
 import build_version
 from build_paths import SDK_SRC_DIR, SCRIPT_DIR, OUT_DIR
 
 # Add SDK make tools scripts to the python path.
 sys.path.append(os.path.join(SDK_SRC_DIR, 'tools'))
 
@@ skipping 158 matching lines @@
     line2 = SplitPattern(line2)[0].lower()
     return cmp(line1, line2)
 
   lines.sort(compare)
   with open(rule_path, 'w') as output:
     for line in lines:
       output.write(line)
 
 
 def main(args):
-  parser = optparse.OptionParser(usage='%prog <rule file> <directory>')
-  parser.add_option('-p', '--platform',
+  parser = argparse.ArgumentParser(description=__doc__)
+  parser.add_argument('-p', '--platform',
       help='Test with this platform, instead of the system\'s platform')
-  parser.add_option('-s', '--sort', action='store_true',
+  parser.add_argument('-s', '--sort', action='store_true',
       help='Sort the file list in place, rather than verifying the contents.')
-  options, args = parser.parse_args(args)
-
-  if not args:
-    args = [os.path.join(SCRIPT_DIR, 'sdk_files.list')]
+  parser.add_argument('rule_file', nargs='?',
+                      default=os.path.join(SCRIPT_DIR, 'sdk_files.list'))
+  parser.add_argument('directory_path', nargs='?')
+  options = parser.parse_args(args)
 
   if options.sort:
-    if not args:
-      parser.error('Expected rule file.')
-    SortFile(args[0])
+    SortFile(options.rule_file)
     return 0
 
-  if len(args) < 2:
+  if not options.directory_path:
     version = build_version.ChromeMajorVersion()
-    args.append(os.path.join(OUT_DIR, 'pepper_%s' % version))
+    options.directory_path = os.path.join(OUT_DIR, 'pepper_%s' % version)
 
-  rule_path, directory_path = args
   if options.platform:
     if options.platform not in VALID_PLATFORMS:
       parser.error('Unknown platform: %s' % options.platform)
     platform = options.platform
   else:
     platform = getos.GetPlatform()
 
   try:
-    return Verify(rule_path, directory_path, platform)
+    return Verify(options.rule_file, options.directory_path, platform)
   except ParseException, e:
-    print >> sys.stderr, 'Error parsing rules:\n', e
+    sys.stderr.write('Error parsing rules:\n%s' % e)

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

additional \n after %s

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

Done.

     return 1
   except VerifyException, e:
-    print >> sys.stderr, 'Error verifying file list:\n', e
+    sys.stderr.write('Error verifying file list:\n%s' % e)
     return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))