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

native_client_sdk/src/build_tools/update_sdktools.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 a version of the
 sdk_tools bundle to use.
 
 Please note the differences between this script and update_nacl_manifest.py:
 
 update_sdktools.py is run by a SDK-team developer to assist in updating to a
 new sdk_tools bundle. A file on the developer's hard drive is modified, and
 must be checked in for the new sdk_tools bundle to be used.
 
 update_nacl_manifest.py is customarily run by a cron job, and does not check in
 any changes. Instead it modifies the manifest file in cloud storage."""
 
 
 import collections
 import difflib
 import json
-import optparse
+import argparse

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

sort

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

Done.

 import re
 import sys
 import urllib2
 
 from manifest_util import DownloadAndComputeHash, DictToJSON
 from update_nacl_manifest import RealDelegate
 
 
 SDK_TOOLS_DESCRIPTION_FORMAT = 'Native Client SDK Tools, revision %d'
 BUCKET_PATH = 'nativeclient-mirror/nacl/nacl_sdk/'
@@ skipping 67 matching lines @@
 
   print 'diff %s' % filename
   print diff_string
   print
 
   with open(filename, 'w') as stream:
     stream.write(new_manifest_string)
 
 
 def main(args):
-  parser = optparse.OptionParser(description=__doc__)
-  parser.add_option('-r', '--revision',
+  parser = argparse.ArgumentParser(description=__doc__)
+  parser.add_argument('-r', '--revision',
       help='set revision manually, rather than using the latest version')
-  options, args = parser.parse_args(args[1:])
-  if len(args) != 0:
-    parser.error('Unexpected args: %s' % ', '.join(args))
+  options = parser.parse_args(args)
 
   # TODO(binji): http://crbug.com/169047. Rename RealDelegate to something else.
   delegate = RealDelegate()
   if not options.revision:
     revision, _ = FindMostRecentSdkTools(delegate)
   else:
     revision = int(options.revision)
 
   UpdateManifestFileToRevision('json/naclsdk_manifest0.json', revision)
   UpdateManifestFileToRevision('json/naclsdk_manifest2.json', revision)
+  return 0
 
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv))
+  sys.exit(main(sys.argv[1:]))