use "options" rather than "opts" to refer to switches

mrjob/launch.py

@@ -25,8 +25,8 @@
 from optparse import OptionParser
 
 from mrjob.conf import combine_dicts
-from mrjob.options import _add_basic_opts
-from mrjob.options import _add_job_opts
+from mrjob.options import _add_basic_options
+from mrjob.options import _add_job_options
 from mrjob.options import _add_runner_options
 from mrjob.options import _allowed_keys
 from mrjob.options import _alphabetize_options
@@ -291,8 +291,8 @@ def configure_options(self):
             self.option_parser, 'Running the entire job')
         self.option_parser.add_option_group(self.runner_opt_group)
 
-        _add_basic_opts(self.runner_opt_group)
-        _add_job_opts(self.runner_opt_group)
+        _add_basic_options(self.runner_opt_group)
+        _add_job_options(self.runner_opt_group)
         _add_runner_options(
             self.runner_opt_group,
             _pick_runner_opts('base') - set(['strict_protocols']))

mrjob/options.py

@@ -1299,7 +1299,7 @@ def _add_runner_options_for_opt(parser, opt_name, include_deprecated=True):
 
 ### non-runner switches ###
 
-def _add_basic_opts(opt_group):
+def _add_basic_options(opt_group):
     """Options for all command line tools"""
 
     opt_group.add_option(
@@ -1322,7 +1322,7 @@ def _add_basic_opts(opt_group):
         action='store_true', help='print more messages to stderr')
 
 
-def _add_job_opts(opt_group):
+def _add_job_options(opt_group):
     opt_group.add_option(
         '--no-output', dest='no_output',
         default=None, action='store_true',

mrjob/tools/emr/audit_usage.py

@@ -60,7 +60,7 @@
 from mrjob.emr import _yield_all_clusters
 from mrjob.emr import _yield_all_bootstrap_actions
 from mrjob.job import MRJob
-from mrjob.options import _add_basic_opts
+from mrjob.options import _add_basic_options
 from mrjob.options import _add_runner_options
 from mrjob.options import _alphabetize_options
 from mrjob.options import _pick_runner_opts
@@ -114,7 +114,7 @@ def _make_option_parser():
         help=('Max number of days ago to look at jobs. By default, we go back'
               ' as far as EMR supports (currently about 2 months)'))
 
-    _add_basic_opts(option_parser)
+    _add_basic_options(option_parser)
     _add_runner_options(
         option_parser,
         _pick_runner_opts('emr', 'connect'))

mrjob/tools/emr/create_cluster.py

@@ -241,7 +241,7 @@
 
 from mrjob.emr import EMRJobRunner
 from mrjob.job import MRJob
-from mrjob.options import _add_basic_opts
+from mrjob.options import _add_basic_options
 from mrjob.options import _add_runner_options
 from mrjob.options import _alphabetize_options
 from mrjob.options import _pick_runner_opts
@@ -286,7 +286,7 @@ def _make_option_parser():
         ' crontab; clusters left idle can quickly become expensive!')
     option_parser = OptionParser(usage=usage, description=description)
 
-    _add_basic_opts(option_parser)
+    _add_basic_options(option_parser)
     _add_runner_options(
         option_parser,
         (_pick_runner_opts('emr', 'connect') |

mrjob/tools/emr/mrboss.py

@@ -53,7 +53,7 @@
 
 from mrjob.emr import EMRJobRunner
 from mrjob.job import MRJob
-from mrjob.options import _add_basic_opts
+from mrjob.options import _add_basic_options
 from mrjob.options import _add_runner_options
 from mrjob.options import _alphabetize_options
 from mrjob.options import _pick_runner_opts
@@ -75,7 +75,7 @@ def main(cl_args=None):
                              default=None,
                              help="Specify an output directory (default:"
                              " CLUSTER_ID)")
-    _add_basic_opts(option_parser)
+    _add_basic_options(option_parser)
     _add_runner_options(
         option_parser,
         _pick_runner_opts('emr', 'connect') | set(

mrjob/tools/emr/report_long_jobs.py

@@ -55,7 +55,7 @@
 from mrjob.emr import _list_all_steps
 from mrjob.emr import _yield_all_clusters
 from mrjob.job import MRJob
-from mrjob.options import _add_basic_opts
+from mrjob.options import _add_basic_options
 from mrjob.options import _add_runner_options
 from mrjob.options import _alphabetize_options
 from mrjob.options import _pick_runner_opts
@@ -231,7 +231,7 @@ def _make_option_parser():
         help=('Minimum number of hours a job can run before we report it.'
               ' Default: %default'))
 
-    _add_basic_opts(option_parser)
+    _add_basic_options(option_parser)
     _add_runner_options(
         option_parser,
         _pick_runner_opts('emr', 'connect')

mrjob/tools/emr/s3_tmpwatch.py

@@ -53,7 +53,7 @@
 from mrjob.emr import EMRJobRunner
 from mrjob.emr import iso8601_to_datetime
 from mrjob.job import MRJob
-from mrjob.options import _add_basic_opts
+from mrjob.options import _add_basic_options
 from mrjob.options import _add_runner_options
 from mrjob.options import _alphabetize_options
 from mrjob.parse import parse_s3_uri
@@ -143,7 +143,7 @@ def _make_option_parser():
         action='store_true',
         help="Don't actually delete any files; just log that we would")
 
-    _add_basic_opts(option_parser)
+    _add_basic_options(option_parser)
     _add_runner_options(
         option_parser,
         set(['region', 's3_endpoint']),

mrjob/tools/emr/terminate_cluster.py

@@ -48,7 +48,7 @@
 
 from mrjob.emr import EMRJobRunner
 from mrjob.job import MRJob
-from mrjob.options import _add_basic_opts
+from mrjob.options import _add_basic_options
 from mrjob.options import _add_runner_options
 from mrjob.options import _alphabetize_options
 from mrjob.options import _pick_runner_opts
@@ -85,7 +85,7 @@ def _make_option_parser():
         action='store_true',
         help="Don't actually delete any files; just log that we would")
 
-    _add_basic_opts(option_parser)
+    _add_basic_options(option_parser)
     _add_runner_options(
         option_parser,
         _pick_runner_opts('emr', 'connect'))

mrjob/tools/emr/terminate_idle_clusters.py

@@ -75,7 +75,7 @@
 from mrjob.emr import _yield_all_bootstrap_actions
 from mrjob.emr import _yield_all_clusters
 from mrjob.job import MRJob
-from mrjob.options import _add_basic_opts
+from mrjob.options import _add_basic_options
 from mrjob.options import _add_runner_options
 from mrjob.options import _alphabetize_options
 from mrjob.options import _pick_runner_opts
@@ -415,7 +415,7 @@ def _make_option_parser():
         action='store_true',
         help="Don't actually kill idle jobs; just log that we would")
 
-    _add_basic_opts(option_parser)
+    _add_basic_options(option_parser)
     _add_runner_options(
         option_parser,
         _pick_runner_opts('emr', 'connect'))