Made some cmd2 module constants cmd2.Cmd class constants

Author: kmvanbrunt

cmd2/cmd2.py

@@ -89,14 +89,6 @@
 except ImportError:  # pragma: no cover
     ipython_available = False
 
-INTERNAL_COMMAND_EPILOG = ("Notes:\n"
-                           "  This command is for internal use and is not intended to be called from the\n"
-                           "  command line.")
-
-# Sorting keys for strings
-ALPHABETICAL_SORT_KEY = utils.norm_fold
-NATURAL_SORT_KEY = utils.natural_keys
-
 
 class _SavedReadlineSettings:
     """readline settings that are backed up when switching between readline environments"""
@@ -140,6 +132,14 @@ class Cmd(cmd.Cmd):
     """
     DEFAULT_EDITOR = utils.find_editor()
 
+    INTERNAL_COMMAND_EPILOG = ("Notes:\n"
+                               "  This command is for internal use and is not intended to be called from the\n"
+                               "  command line.")
+
+    # Sorting keys for strings
+    ALPHABETICAL_SORT_KEY = utils.norm_fold
+    NATURAL_SORT_KEY = utils.natural_keys
+
     def __init__(self, completekey: str = 'tab', stdin=None, stdout=None, *,
                  persistent_history_file: str = '', persistent_history_length: int = 1000,
                  startup_script: str = '', use_ipython: bool = False,
@@ -194,7 +194,7 @@ def __init__(self, completekey: str = 'tab', stdin=None, stdout=None, *,
         self.continuation_prompt = '> '
         self.debug = False
         self.echo = False
-        self.editor = self.DEFAULT_EDITOR
+        self.editor = Cmd.DEFAULT_EDITOR
         self.feedback_to_output = False  # Do not include nonessentials in >, | output by default (things like timing)
         self.locals_in_py = False
 
@@ -330,7 +330,7 @@ def __init__(self, completekey: str = 'tab', stdin=None, stdout=None, *,
         #     command and category names
         #     alias, macro, settable, and shortcut names
         #     tab completion results when self.matches_sorted is False
-        self.default_sort_key = ALPHABETICAL_SORT_KEY
+        self.default_sort_key = Cmd.ALPHABETICAL_SORT_KEY
 
         ############################################################################################################
         # The following variables are used by tab-completion functions. They are reset each time complete() is run

tests/test_completion.py

@@ -187,13 +187,13 @@ def test_default_sort_key(cmd2_app):
     begidx = endidx - len(text)
 
     # First do alphabetical sorting
-    cmd2_app.default_sort_key = cmd2.cmd2.ALPHABETICAL_SORT_KEY
+    cmd2_app.default_sort_key = cmd2.Cmd.ALPHABETICAL_SORT_KEY
     expected = ['1', '11', '2']
     first_match = complete_tester(text, line, begidx, endidx, cmd2_app)
     assert first_match is not None and cmd2_app.completion_matches == expected
 
     # Now switch to natural sorting
-    cmd2_app.default_sort_key = cmd2.cmd2.NATURAL_SORT_KEY
+    cmd2_app.default_sort_key = cmd2.Cmd.NATURAL_SORT_KEY
     expected = ['1', '2', '11']
     first_match = complete_tester(text, line, begidx, endidx, cmd2_app)
     assert first_match is not None and cmd2_app.completion_matches == expected