Renamed Cmd2ArgParser to ArgParser

2 files changed, 24 insertions, 25 deletions

diff --git a/tests/test_argparse_completer.py b/tests/test_argparse_completer.py
index 2a30fc3b..3274ad0c 100644
--- a/tests/test_argparse_completer.py
+++ b/tests/test_argparse_completer.py
@@ -9,7 +9,7 @@ from typing import List
 import pytest
 
 import cmd2
-from cmd2 import with_argparser, Cmd2ArgParser, CompletionItem
+from cmd2 import with_argparser, CompletionItem
 from cmd2.utils import StdSim, basic_complete
 from .conftest import run_cmd, complete_tester
 
@@ -63,7 +63,7 @@ class AutoCompleteTester(cmd2.Cmd):
         self.poutput('music create rock')
 
     # Top level parser for music command
-    music_parser = Cmd2ArgParser(description='Manage music', prog='music')
+    music_parser = cmd2.ArgParser(description='Manage music', prog='music')
 
     # Add sub-commands to music
     music_subparsers = music_parser.add_subparsers()
@@ -100,7 +100,7 @@ class AutoCompleteTester(cmd2.Cmd):
     ############################################################################################################
 
     # Uses default flag prefix value (-)
-    flag_parser = Cmd2ArgParser()
+    flag_parser = cmd2.ArgParser()
     flag_parser.add_argument('-n', '--normal_flag', help='A normal flag', action='store_true')
     flag_parser.add_argument('-a', '--append_flag', help='Append flag', action='append')
     flag_parser.add_argument('-o', '--append_const_flag', help='Append const flag', action='append_const', const=True)
@@ -113,7 +113,7 @@ class AutoCompleteTester(cmd2.Cmd):
         pass
 
     # Uses non-default flag prefix value (+)
-    plus_flag_parser = Cmd2ArgParser(prefix_chars='+')
+    plus_flag_parser = cmd2.ArgParser(prefix_chars='+')
     plus_flag_parser.add_argument('+n', '++normal_flag', help='A normal flag', action='store_true')
 
     @with_argparser(plus_flag_parser)
@@ -135,7 +135,7 @@ class AutoCompleteTester(cmd2.Cmd):
             items.append(CompletionItem(main_str, desc='blah blah'))
         return items
 
-    choices_parser = Cmd2ArgParser()
+    choices_parser = cmd2.ArgParser()
 
     # Flag args for choices command. Include string and non-string arg types.
     choices_parser.add_argument("-l", "--list", help="a flag populated with a choices list",
@@ -168,7 +168,7 @@ class AutoCompleteTester(cmd2.Cmd):
         """Tab completion method"""
         return basic_complete(text, line, begidx, endidx, completions_from_method)
 
-    completer_parser = Cmd2ArgParser()
+    completer_parser = cmd2.ArgParser()
 
     # Flag args for completer command
     completer_parser.add_argument("-f", "--function", help="a flag using a completer function",
@@ -189,7 +189,7 @@ class AutoCompleteTester(cmd2.Cmd):
     ############################################################################################################
     # Begin code related to nargs
     ############################################################################################################
-    nargs_parser = Cmd2ArgParser()
+    nargs_parser = cmd2.ArgParser()
 
     # Flag args for nargs command
     nargs_parser.add_argument("--set_value", help="a flag with a set value for nargs", nargs=2,
@@ -215,7 +215,7 @@ class AutoCompleteTester(cmd2.Cmd):
     ############################################################################################################
     # Begin code related to testing tab hints
     ############################################################################################################
-    hint_parser = Cmd2ArgParser()
+    hint_parser = cmd2.ArgParser()
     hint_parser.add_argument('-f', '--flag', help='a flag arg')
     hint_parser.add_argument('-s', '--suppressed_help', help=argparse.SUPPRESS)
     hint_parser.add_argument('-t', '--suppressed_hint', help='a flag arg', suppress_tab_hint=True)
@@ -652,7 +652,7 @@ Hint:
 
 def test_starts_like_flag():
     from cmd2.argparse_completer import starts_like_flag
-    parser = Cmd2ArgParser()
+    parser = cmd2.ArgParser()
 
     # Does not start like a flag
     assert not starts_like_flag('', parser)
@@ -670,7 +670,7 @@ def test_starts_like_flag():
 def test_complete_command_no_tokens(ac_app):
     from cmd2.argparse_completer import AutoCompleter
 
-    parser = Cmd2ArgParser()
+    parser = cmd2.ArgParser()
     ac = AutoCompleter(parser, ac_app)
 
     completions = ac.complete_command(tokens=[], text='', line='', begidx=0, endidx=0)
@@ -680,7 +680,7 @@ def test_complete_command_no_tokens(ac_app):
 def test_complete_command_help_no_tokens(ac_app):
     from cmd2.argparse_completer import AutoCompleter
 
-    parser = Cmd2ArgParser()
+    parser = cmd2.ArgParser()
     ac = AutoCompleter(parser, ac_app)
 
     completions = ac.complete_command_help(tokens=[], text='', line='', begidx=0, endidx=0)
diff --git a/tests/test_argparse_custom.py b/tests/test_argparse_custom.py
index 35d97974..b738efa3 100644
--- a/tests/test_argparse_custom.py
+++ b/tests/test_argparse_custom.py
@@ -7,7 +7,6 @@ import argparse
 import pytest
 
 import cmd2
-from cmd2.argparse_custom import Cmd2ArgParser
 from .conftest import run_cmd
 
 
@@ -16,7 +15,7 @@ class ApCustomTestApp(cmd2.Cmd):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-    range_parser = Cmd2ArgParser()
+    range_parser = cmd2.ArgParser()
     range_parser.add_argument('--arg1', nargs=(2, 3))
     range_parser.add_argument('--arg2', nargs=argparse.ZERO_OR_MORE)
     range_parser.add_argument('--arg3', nargs=argparse.ONE_OR_MORE)
@@ -47,7 +46,7 @@ def fake_func():
     ({'choices_method': fake_func, 'completer_method': fake_func}, False),
 ])
 def test_apcustom_invalid_args(args, is_valid):
-    parser = Cmd2ArgParser(prog='test')
+    parser = cmd2.ArgParser(prog='test')
     try:
         parser.add_argument('name', **args)
         assert is_valid
@@ -58,7 +57,7 @@ def test_apcustom_invalid_args(args, is_valid):
 
 def test_apcustom_usage():
     usage = "A custom usage statement"
-    parser = Cmd2ArgParser(usage=usage)
+    parser = cmd2.ArgParser(usage=usage)
     help = parser.format_help()
     assert usage in help
 
@@ -76,46 +75,46 @@ def test_apcustom_nargs_not_enough(cust_app):
 
 def test_apcustom_narg_empty_tuple():
     with pytest.raises(ValueError) as excinfo:
-        parser = Cmd2ArgParser(prog='test')
+        parser = cmd2.ArgParser(prog='test')
         parser.add_argument('invalid_tuple', nargs=())
     assert 'Ranged values for nargs must be a tuple of 2 integers' in str(excinfo.value)
 
 
 def test_apcustom_narg_single_tuple():
     with pytest.raises(ValueError) as excinfo:
-        parser = Cmd2ArgParser(prog='test')
+        parser = cmd2.ArgParser(prog='test')
         parser.add_argument('invalid_tuple', nargs=(1,))
     assert 'Ranged values for nargs must be a tuple of 2 integers' in str(excinfo.value)
 
 
 def test_apcustom_narg_tuple_triple():
     with pytest.raises(ValueError) as excinfo:
-        parser = Cmd2ArgParser(prog='test')
+        parser = cmd2.ArgParser(prog='test')
         parser.add_argument('invalid_tuple', nargs=(1, 2, 3))
     assert 'Ranged values for nargs must be a tuple of 2 integers' in str(excinfo.value)
 
 
 def test_apcustom_narg_tuple_order():
     with pytest.raises(ValueError) as excinfo:
-        parser = Cmd2ArgParser(prog='test')
+        parser = cmd2.ArgParser(prog='test')
         parser.add_argument('invalid_tuple', nargs=(2, 1))
     assert 'Invalid nargs range. The first value must be less than the second' in str(excinfo.value)
 
 
 def test_apcustom_narg_tuple_negative():
     with pytest.raises(ValueError) as excinfo:
-        parser = Cmd2ArgParser(prog='test')
+        parser = cmd2.ArgParser(prog='test')
         parser.add_argument('invalid_tuple', nargs=(-1, 1))
     assert 'Negative numbers are invalid for nargs range' in str(excinfo.value)
 
 
 def test_apcustom_narg_tuple_zero_base():
-    parser = Cmd2ArgParser(prog='test')
+    parser = cmd2.ArgParser(prog='test')
     parser.add_argument('tuple', nargs=(0, 3))
 
 
 def test_apcustom_narg_tuple_zero_to_one():
-    parser = Cmd2ArgParser(prog='test')
+    parser = cmd2.ArgParser(prog='test')
     parser.add_argument('tuple', nargs=(0, 1))
 
 
@@ -124,13 +123,13 @@ def test_apcustom_print_message(capsys):
     test_message = 'The test message'
 
     # Specify the file
-    parser = Cmd2ArgParser(prog='test')
+    parser = cmd2.ArgParser(prog='test')
     parser._print_message(test_message, file=sys.stdout)
     out, err = capsys.readouterr()
     assert test_message in out
 
     # Make sure file defaults to sys.stderr
-    parser = Cmd2ArgParser(prog='test')
+    parser = cmd2.ArgParser(prog='test')
     parser._print_message(test_message)
     out, err = capsys.readouterr()
     assert test_message in err
@@ -138,7 +137,7 @@ def test_apcustom_print_message(capsys):
 
 def test_apcustom_required_options():
     # Make sure a 'required arguments' section shows when a flag is marked required
-    parser = Cmd2ArgParser(prog='test')
+    parser = cmd2.ArgParser(prog='test')
     parser.add_argument('--required_flag', required=True)
     help = parser.format_help()