toolchain-utils: remove uses of deprecated-module 'optparse'.

BUG=chromium:570458
TEST='crosperf/run_tests.sh' passes.

Change-Id: I0e239a91abad72920c0d5e6e70b43683ecccb868
Reviewed-on: https://chrome-internal-review.googlesource.com/246640
Commit-Ready: Rahul Chaudhry <rahulchaudhry@google.com>
Tested-by: Rahul Chaudhry <rahulchaudhry@google.com>
Reviewed-by: Luis Lozano <llozano@chromium.org>

3 files changed, 49 insertions, 80 deletions

diff --git a/crosperf/crosperf.py b/crosperf/crosperf.py
index 9f8edc0e..6b00cf7f 100755
--- a/crosperf/crosperf.py
+++ b/crosperf/crosperf.py
@@ -6,7 +6,7 @@
 from __future__ import print_function
 
 import atexit
-import optparse
+import argparse
 import os
 import signal
 import sys
@@ -14,37 +14,29 @@ from experiment_runner import ExperimentRunner
 from experiment_runner import MockExperimentRunner
 from experiment_factory import ExperimentFactory
 from experiment_file import ExperimentFile
-from help import Help
 from settings_factory import GlobalSettings
 from utils import logger
 
 import test_flag
 
 
-class MyIndentedHelpFormatter(optparse.IndentedHelpFormatter):
-  """Help formatter."""
-
-  def format_description(self, description):
-    return description
-
-
 def SetupParserOptions(parser):
   """Add all options to the parser."""
-  parser.add_option('--dry_run',
-                    dest='dry_run',
-                    help=('Parse the experiment file and '
-                          'show what will be done'),
-                    action='store_true',
-                    default=False)
+  parser.add_argument('--dry_run',
+                      dest='dry_run',
+                      help=('Parse the experiment file and '
+                            'show what will be done'),
+                      action='store_true',
+                      default=False)
   # Allow each of the global fields to be overridden by passing in
   # options. Add each global field as an option.
   option_settings = GlobalSettings('')
   for field_name in option_settings.fields:
     field = option_settings.fields[field_name]
-    parser.add_option('--%s' % field.name,
-                      dest=field.name,
-                      help=field.description,
-                      action='store')
+    parser.add_argument('--%s' % field.name,
+                        dest=field.name,
+                        help=field.description,
+                        action='store')
 
 
 def ConvertOptionsToSettings(options):
@@ -73,25 +65,22 @@ def CallExitHandler(signum, _):
 
 
 def Main(argv):
-  parser = optparse.OptionParser(usage=Help().GetUsage(),
-                                 description=Help().GetHelp(),
-                                 formatter=MyIndentedHelpFormatter(),
-                                 version='%prog 3.0')
-
-  parser.add_option('--noschedv2',
-                    dest='noschedv2',
-                    default=False,
-                    action='store_true',
-                    help=('Do not use new scheduler. '
-                          'Use original scheduler instead.'))
-  parser.add_option('-l',
-                    '--log_dir',
-                    dest='log_dir',
-                    default='',
-                    help='The log_dir, default is under <crosperf_logs>/logs')
+  parser = argparse.ArgumentParser()
+
+  parser.add_argument('--noschedv2',
+                      dest='noschedv2',
+                      default=False,
+                      action='store_true',
+                      help=('Do not use new scheduler. '
+                            'Use original scheduler instead.'))
+  parser.add_argument('-l',
+                      '--log_dir',
+                      dest='log_dir',
+                      default='',
+                      help='The log_dir, default is under <crosperf_logs>/logs')
 
   SetupParserOptions(parser)
-  options, args = parser.parse_args(argv)
+  options, args = parser.parse_known_args(argv)
 
   # Convert the relevant options that are passed in into a settings
   # object which will override settings in the experiment file.
diff --git a/crosperf/crosperf_unittest.py b/crosperf/crosperf_unittest.py
index 5dd0e09f..7e07ee0c 100755
--- a/crosperf/crosperf_unittest.py
+++ b/crosperf/crosperf_unittest.py
@@ -5,7 +5,7 @@
 
 from __future__ import print_function
 
-import optparse
+import argparse
 import StringIO
 
 import unittest
@@ -42,43 +42,23 @@ class CrosperfTest(unittest.TestCase):
     input_file = StringIO.StringIO(EXPERIMENT_FILE_1)
     self.exp_file = experiment_file.ExperimentFile(input_file)
 
-  def test_setup_parser_options(self):
-
-    parser = optparse.OptionParser(usage=Help().GetUsage(),
-                                   description=Help().GetHelp(),
-                                   formatter=crosperf.MyIndentedHelpFormatter(),
-                                   version='%prog 3.0')
-    parser.add_option('-l',
-                      '--log_dir',
-                      dest='log_dir',
-                      default='',
-                      help='The log_dir, default is under <crosperf_logs>/logs')
-    options_before = parser.option_list
-    self.assertEqual(len(options_before), 3)
-    crosperf.SetupParserOptions(parser)
-    options_after = parser.option_list
-    self.assertEqual(len(options_after), 29)
-
   def test_convert_options_to_settings(self):
-    parser = optparse.OptionParser(usage=Help().GetUsage(),
-                                   description=Help().GetHelp(),
-                                   formatter=crosperf.MyIndentedHelpFormatter(),
-                                   version='%prog 3.0')
-    parser.add_option('-l',
-                      '--log_dir',
-                      dest='log_dir',
-                      default='',
-                      help='The log_dir, default is under <crosperf_logs>/logs')
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-l',
+                        '--log_dir',
+                        dest='log_dir',
+                        default='',
+                        help='The log_dir, default is under <crosperf_logs>/logs')
     crosperf.SetupParserOptions(parser)
     argv = ['crosperf/crosperf.py', 'temp.exp', '--rerun=True']
-    options, _ = parser.parse_args(argv)
+    options, _ = parser.parse_known_args(argv)
     settings = crosperf.ConvertOptionsToSettings(options)
     self.assertIsNotNone(settings)
     self.assertIsInstance(settings, settings_factory.GlobalSettings)
     self.assertEqual(len(settings.fields), 25)
     self.assertTrue(settings.GetField('rerun'))
     argv = ['crosperf/crosperf.py', 'temp.exp']
-    options, _ = parser.parse_args(argv)
+    options, _ = parser.parse_known_args(argv)
     settings = crosperf.ConvertOptionsToSettings(options)
     self.assertFalse(settings.GetField('rerun'))
 
diff --git a/utils/perf_diff.py b/utils/perf_diff.py
index a19470d9..ee5a4b80 100755
--- a/utils/perf_diff.py
+++ b/utils/perf_diff.py
@@ -9,7 +9,7 @@ from __future__ import print_function
 
 __author__ = 'asharif@google.com (Ahmad Sharif)'
 
-import optparse
+import argparse
 import re
 import sys
 
@@ -299,20 +299,20 @@ class PerfDiffer(object):
 
 def Main(argv):
   """The entry of the main."""
-  parser = optparse.OptionParser()
-  parser.add_option('-n',
-                    '--num_symbols',
-                    dest='num_symbols',
-                    default='5',
-                    help='The number of symbols to show.')
-  parser.add_option('-c',
-                    '--common_only',
-                    dest='common_only',
-                    action='store_true',
-                    default=False,
-                    help='Diff common symbols only.')
-
-  options, args = parser.parse_args(argv)
+  parser = argparse.ArgumentParser()
+  parser.add_argument('-n',
+                      '--num_symbols',
+                      dest='num_symbols',
+                      default='5',
+                      help='The number of symbols to show.')
+  parser.add_argument('-c',
+                      '--common_only',
+                      dest='common_only',
+                      action='store_true',
+                      default=False,
+                      help='Diff common symbols only.')
+
+  options, args = parser.parse_known_args(argv)
 
   try:
     reports = []