Merge pull request #7765 from aws/fix-help-output

Fix help message when using `--help`

Author: stealthycoin

.changes/next-release/bugfix-argumentparsing-97824.json

@@ -0,0 +1,5 @@
+{
+  "type": "bugfix",
+  "category": "argument parsing",
+  "description": "Fixes issue reported in `#303 <https://github.com/aws/aws-cli/issues/303>`__ involving -h/--help output"
+}

awscli/argparser.py

@@ -277,6 +277,7 @@ def _non_required_arg_table(self, argument_table):
 
 class FirstPassGlobalArgParser(CLIArgParser):
     def __init__(self, *args, **kwargs):
+        kwargs['add_help'] = False
         super().__init__(*args, **kwargs)
         self._build()
 

tests/unit/test_clidriver.py

@@ -749,7 +749,9 @@ def test_help_blurb_in_operation_error_message(self):
         self.assertIn(HELP_BLURB, self.stderr.getvalue())
 
     def test_help_blurb_in_unknown_argument_error_message(self):
-        rc = self.driver.main(['s3api', 'list-objects', '--help'])
+        args = ['s3api', 'list-objects', '--help']
+        driver = create_clidriver(args)
+        rc = driver.main(args)
         self.assertEqual(rc, 252)
         self.assertIn(HELP_BLURB, self.stderr.getvalue())