cmd2 3.0.0rc1__tar.gz → 3.1.0__tar.gz

{cmd2-3.0.0rc1 → cmd2-3.1.0}/.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.13.2"
+    rev: "v0.14.10"
     hooks:
       - id: ruff-format
         args: [--config=ruff.toml]
@@ -21,5 +21,5 @@ repos:
     hooks:
       - id: prettier
         additional_dependencies:
-          - prettier@3.6.2
+          - prettier@3.7.4
           - prettier-plugin-toml@2.0.6

{cmd2-3.0.0rc1 → cmd2-3.1.0}/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 3.0.0 (October TBD, 2025)
+## 3.1.0 (December 25, 2025)
+
+- Potentially Breaking Changes
+    - `cmd2` no longer has a dependency on `cmd` and `cmd2.Cmd` no longer inherits from `cmd.Cmd`
+        - We don't _think_ this should impact users, but there is theoretically a possibility
+        - This opens the door for more impactful changes in the next major release
+
+## 3.0.0 (December 7, 2025)
 
 ### Summary
 
@@ -16,6 +23,8 @@ time reading the [rich documentation](https://rich.readthedocs.io/).
           [rich_tables.py](https://github.com/python-cmd2/cmd2/blob/main/examples/rich_tables.py)
           example for more info)
         - Moved all string-related functions from `utils.py` to a new `string_utils.py` module
+            - Removed redundant `string` from some of the names so `quote_string` is now just
+              `quote` and `quote_string_if_needed` is now `quote_if_needed`
         - Consolidated all string styling functions from `ansi.py` into `string_utils.py`
         - Replaced all text style enums from `ansi.py` with modern `rich` styles
         - Renamed `ansi.py` to `terminal_utils.py` to better reflect its purpose
@@ -25,6 +34,16 @@ time reading the [rich documentation](https://rich.readthedocs.io/).
     - Removed redundant setting of a parser's `prog` value in the `with_argparser()` decorator, as
       this is now handled centrally in `Cmd._build_parser()`
     - The `auto_load_commands` argument to `cmd2.Cmd.__init__` now defaults to `False`
+    - `argparse_custom` module breaking changes:
+        - `descriptive_header: str` replaced with `descriptive_headers: Sequence[str | rich.Column]`
+            - Applies to parameter name when adding an argument to a parser as well as
+              `set_descriptive_headers` and `get_descriptive_headers`
+        - `CompletionItem.description: str` changed to
+          `CompletionItem.descriptive_data: Sequence[str | rich.Column]`
+    - `decorators` module breaking changes:
+        - `_set_parser_prog` renamed to `set_parser_prog` (without the leading underscore) and moved
+          to `argparse_custom` module
+    - Renamed history `--output_file` to `--output-file` to follow common command-line practices
 
 - Enhancements
     - Enhanced all print methods (`poutput()`, `perror()`, `ppaged()`, etc.) to natively render

{cmd2-3.0.0rc1 → cmd2-3.1.0}/Makefile

@@ -2,8 +2,8 @@
 .PHONY: install
 install: ## Install the virtual environment with dependencies
 	@echo "🚀 Creating uv Python virtual environment"
-	@uv python install 3.13
-	@uv sync --python=3.13
+	@uv python install 3.14
+	@uv sync --python=3.14
 	@echo "🚀 Installing Git pre-commit hooks locally"
 	@uv run pre-commit install
 	@echo "🚀 Installing Prettier using npm"
@@ -46,7 +46,7 @@ docs: ## Build and serve the documentation
 .PHONY: build
 build: clean-build ## Build wheel file
 	@echo "🚀 Creating wheel file"
-	@uvx --from build pyproject-build --installer uv
+	@uv build
 
 .PHONY: clean-build
 clean-build: ## Clean build artifacts
@@ -66,14 +66,14 @@ validate-tag: ## Check to make sure that a tag exists for the current HEAD and i
 	@uv run inv validatetag
 
 .PHONY: publish-test
-publish-test: validate-tag build ## Test publishing a release to PyPI.
+publish-test: validate-tag build ## Test publishing a release to PyPI, uses token from ~/.pypirc file.
 	@echo "🚀 Publishing: Dry run."
-	@uvx twine upload --repository testpypi dist/*
+	@uv run uv-publish --repository testpypi
 
 .PHONY: publish
-publish: validate-tag build ## Publish a release to PyPI.
+publish: validate-tag build ## Publish a release to PyPI, uses token from ~/.pypirc file.
 	@echo "🚀 Publishing."
-	@uvx twine upload dist/*
+	@uv run uv-publish
 
 .PHONY: help
 help:

{cmd2-3.0.0rc1 → cmd2-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmd2
-Version: 3.0.0rc1
+Version: 3.1.0
 Summary: cmd2 - quickly build feature-rich and user-friendly interactive command line applications in Python
 Author: cmd2 Contributors
 License-Expression: MIT
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Free Threading :: 3 - Stable
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
@@ -23,7 +24,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: backports.strenum; python_version == "3.10"
 Requires-Dist: gnureadline>=8; platform_system == "Darwin"
-Requires-Dist: pyperclip>=1.8
+Requires-Dist: pyperclip>=1.8.2
 Requires-Dist: pyreadline3>=3.4; platform_system == "Windows"
 Requires-Dist: rich>=14.1.0
 Requires-Dist: rich-argparse>=1.7.1
@@ -56,10 +57,10 @@ applications. It provides a simple API which is an extension of Python's built-i
 of cmd to make your life easier and eliminates much of the boilerplate code which would be necessary
 when using cmd.
 
-> :warning: **cmd2 is now "feature complete" for the `2.x` branch and is actively working on the
-> 3.0.0 release on the `main` branch. New features will only be addressed in 3.x moving forwards. If
-> need be, we will still fix bugs in 2.x. A beta version, 3.0.0b2, is available for testing and we
-> would appreciate feedback.**
+> :warning: **`cmd2` 3.0.0 has been released and there are some significant backwards
+> incompatibilities from version `2.x`. Please see the
+> [Migration Guide](https://cmd2.readthedocs.io/en/latest/upgrades/) for tips on upgrading from
+> `cmd2` 2.x to 3.x.**
 
 ## The developers toolbox
 

{cmd2-3.0.0rc1 → cmd2-3.1.0}/README.md

@@ -25,10 +25,10 @@ applications. It provides a simple API which is an extension of Python's built-i
 of cmd to make your life easier and eliminates much of the boilerplate code which would be necessary
 when using cmd.
 
-> :warning: **cmd2 is now "feature complete" for the `2.x` branch and is actively working on the
-> 3.0.0 release on the `main` branch. New features will only be addressed in 3.x moving forwards. If
-> need be, we will still fix bugs in 2.x. A beta version, 3.0.0b2, is available for testing and we
-> would appreciate feedback.**
+> :warning: **`cmd2` 3.0.0 has been released and there are some significant backwards
+> incompatibilities from version `2.x`. Please see the
+> [Migration Guide](https://cmd2.readthedocs.io/en/latest/upgrades/) for tips on upgrading from
+> `cmd2` 2.x to 3.x.**
 
 ## The developers toolbox
 

{cmd2-3.0.0rc1 → cmd2-3.1.0}/cmd2/argparse_completer.py

@@ -39,7 +39,7 @@ from .exceptions import CompletionError
 from .styles import Cmd2Style
 
 # If no descriptive headers are supplied, then this will be used instead
-DEFAULT_DESCRIPTIVE_HEADERS: Sequence[str | Column] = ('Description',)
+DEFAULT_DESCRIPTIVE_HEADERS: Sequence[str | Column] = ['Description']
 
 # Name of the choice/completer function argument that, if present, will be passed a dictionary of
 # command line tokens up through the token being completed mapped to their argparse destination name.

{cmd2-3.0.0rc1 → cmd2-3.1.0}/cmd2/argparse_custom.py

@@ -804,7 +804,7 @@ def _add_argument_wrapper(
     choices_provider: ChoicesProviderFunc | None = None,
     completer: CompleterFunc | None = None,
     suppress_tab_hint: bool = False,
-    descriptive_headers: list[Column | str] | None = None,
+    descriptive_headers: Sequence[str | Column] | None = None,
     **kwargs: Any,
 ) -> argparse.Action:
     """Wrap ActionsContainer.add_argument() which supports more settings used by cmd2.

{cmd2-3.0.0rc1 → cmd2-3.1.0}/cmd2/cmd2.py

@@ -1,24 +1,26 @@
-"""Variant on standard library's cmd with extra features.
-
-To use, simply import cmd2.Cmd instead of cmd.Cmd; use precisely as though you
-were using the standard library's cmd, while enjoying the extra features.
-
-Searchable command history (commands: "history")
-Run commands from file, save to file, edit commands in file
-Multi-line commands
-Special-character shortcut commands (beyond cmd's "?" and "!")
-Settable environment parameters
-Parsing commands with `argparse` argument parsers (flags)
-Redirection to file or paste buffer (clipboard) with > or >>
-Easy transcript-based testing of applications (see examples/transcript_example.py)
-Bash-style ``select`` available
+"""cmd2 - quickly build feature-rich and user-friendly interactive command line applications in Python.
+
+cmd2 is a tool for building interactive command line applications in Python. Its goal is to make it quick and easy for
+developers to build feature-rich and user-friendly interactive command line applications. It provides a simple API which
+is an extension of Python's built-in cmd module. cmd2 provides a wealth of features on top of cmd to make your life easier
+and eliminates much of the boilerplate code which would be necessary when using cmd.
+
+Extra features include:
+- Searchable command history (commands: "history")
+- Run commands from file, save to file, edit commands in file
+- Multi-line commands
+- Special-character shortcut commands (beyond cmd's "?" and "!")
+- Settable environment parameters
+- Parsing commands with `argparse` argument parsers (flags)
+- Redirection to file or paste buffer (clipboard) with > or >>
+- Easy transcript-based testing of applications (see examples/transcript_example.py)
+- Bash-style ``select`` available
 
 Note, if self.stdout is different than sys.stdout, then redirection with > and |
 will only work if `self.poutput()` is used in place of `print`.
 
-- Catherine Devlin, Jan 03 2008 - catherinedevlin.blogspot.com
-
-Git repository on GitHub at https://github.com/python-cmd2/cmd2
+GitHub: https://github.com/python-cmd2/cmd2
+Documentation: https://cmd2.readthedocs.io/
 """
 
 # This module has many imports, quite a few of which are only
@@ -26,7 +28,6 @@ Git repository on GitHub at https://github.com/python-cmd2/cmd2
 # import this module, many of these imports are lazy-loaded
 # i.e. we only import the module when we use it.
 import argparse
-import cmd
 import contextlib
 import copy
 import functools
@@ -64,7 +65,7 @@ from typing import (
 )
 
 import rich.box
-from rich.console import Group
+from rich.console import Group, RenderableType
 from rich.highlighter import ReprHighlighter
 from rich.rule import Rule
 from rich.style import Style, StyleType
@@ -286,7 +287,7 @@ class _CommandParsers:
             del self._parsers[full_method_name]
 
 
-class Cmd(cmd.Cmd):
+class Cmd:
     """An easy but powerful framework for writing line-oriented command interpreters.
 
     Extends the Python Standard Library's cmd package by adding a lot of useful features
@@ -304,6 +305,8 @@ class Cmd(cmd.Cmd):
     # List for storing transcript test file names
     testfiles: ClassVar[list[str]] = []
 
+    DEFAULT_PROMPT = '(Cmd) '
+
     def __init__(
         self,
         completekey: str = 'tab',
@@ -326,6 +329,7 @@ class Cmd(cmd.Cmd):
         auto_load_commands: bool = False,
         allow_clipboard: bool = True,
         suggest_similar_command: bool = False,
+        intro: RenderableType = '',
     ) -> None:
         """Easy but powerful framework for writing line-oriented command interpreters, extends Python's cmd package.
 
@@ -376,6 +380,7 @@ class Cmd(cmd.Cmd):
         :param suggest_similar_command: If ``True``, ``cmd2`` will attempt to suggest the most
                                         similar command when the user types a command that does
                                         not exist. Default: ``False``.
+        "param intro: Intro banner to print when starting the application.
         """
         # Check if py or ipy need to be disabled in this instance
         if not include_py:
@@ -384,11 +389,28 @@ class Cmd(cmd.Cmd):
             setattr(self, 'do_ipy', None)  # noqa: B010
 
         # initialize plugin system
-        # needs to be done before we call __init__(0)
+        # needs to be done before we most of the other stuff below
         self._initialize_plugin_system()
 
-        # Call super class constructor
-        super().__init__(completekey=completekey, stdin=stdin, stdout=stdout)
+        # Configure a few defaults
+        self.prompt = Cmd.DEFAULT_PROMPT
+        self.intro = intro
+        self.use_rawinput = True
+
+        # What to use for standard input
+        if stdin is not None:
+            self.stdin = stdin
+        else:
+            self.stdin = sys.stdin
+
+        # What to use for standard output
+        if stdout is not None:
+            self.stdout = stdout
+        else:
+            self.stdout = sys.stdout
+
+        # Key used for tab completion
+        self.completekey = completekey
 
         # Attributes which should NOT be dynamically settable via the set command at runtime
         self.default_to_shell = False  # Attempt to run unrecognized commands as shell commands
@@ -2412,9 +2434,7 @@ class Cmd(cmd.Cmd):
             if len(self.completion_matches) == 1 and self.allow_closing_quote and completion_token_quote:
                 self.completion_matches[0] += completion_token_quote
 
-    def complete(  # type: ignore[override]
-        self, text: str, state: int, custom_settings: utils.CustomCompletionSettings | None = None
-    ) -> str | None:
+    def complete(self, text: str, state: int, custom_settings: utils.CustomCompletionSettings | None = None) -> str | None:
         """Override of cmd's complete method which returns the next possible completion for 'text'.
 
         This completer function is called by readline as complete(text, state), for state in 0, 1, 2, …,
@@ -2693,10 +2713,6 @@ class Cmd(cmd.Cmd):
     def parseline(self, line: str) -> tuple[str, str, str]:
         """Parse the line into a command name and a string containing the arguments.
 
-        NOTE: This is an override of a parent class method.  It is only used by other parent class methods.
-
-        Different from the parent class method, this ignores self.identchars.
-
         :param line: line read by readline
         :return: tuple containing (command, args, line)
         """
@@ -3086,7 +3102,7 @@ class Cmd(cmd.Cmd):
 
         # Initialize the redirection saved state
         redir_saved_state = utils.RedirectionSavedState(
-            cast(TextIO, self.stdout), stdouts_match, self._cur_pipe_proc_reader, self._redirecting
+            self.stdout, stdouts_match, self._cur_pipe_proc_reader, self._redirecting
         )
 
         # The ProcReader for this command
@@ -3141,7 +3157,7 @@ class Cmd(cmd.Cmd):
                 new_stdout.close()
                 raise RedirectionError(f'Pipe process exited with code {proc.returncode} before command could run')
             redir_saved_state.redirecting = True
-            cmd_pipe_proc_reader = utils.ProcReader(proc, cast(TextIO, self.stdout), sys.stderr)
+            cmd_pipe_proc_reader = utils.ProcReader(proc, self.stdout, sys.stderr)
 
             self.stdout = new_stdout
             if stdouts_match:
@@ -3276,7 +3292,7 @@ class Cmd(cmd.Cmd):
 
         return stop if stop is not None else False
 
-    def default(self, statement: Statement) -> bool | None:  # type: ignore[override]
+    def default(self, statement: Statement) -> bool | None:
         """Execute when the command given isn't a recognized command implemented by a do_* method.
 
         :param statement: Statement object with parsed input
@@ -3293,6 +3309,15 @@ class Cmd(cmd.Cmd):
         self.perror(err_msg, style=None)
         return None
 
+    def completedefault(self, *_ignored: list[str]) -> list[str]:
+        """Call to complete an input line when no command-specific complete_*() method is available.
+
+        This method is only called for non-argparse-based commands.
+
+        By default, it returns an empty list.
+        """
+        return []
+
     def _suggest_similar_command(self, command: str) -> str | None:
         return suggest_similar(command, self.get_visible_commands())
 
@@ -4131,10 +4156,6 @@ class Cmd(cmd.Cmd):
         )
         return help_parser
 
-    # Get rid of cmd's complete_help() functions so ArgparseCompleter will complete the help command
-    if getattr(cmd.Cmd, 'complete_help', None) is not None:
-        delattr(cmd.Cmd, 'complete_help')
-
     @with_argparser(_build_help_parser)
     def do_help(self, args: argparse.Namespace) -> None:
         """List available commands or provide detailed help for a specific command."""
@@ -4640,7 +4661,7 @@ class Cmd(cmd.Cmd):
                 **kwargs,
             )
 
-            proc_reader = utils.ProcReader(proc, cast(TextIO, self.stdout), sys.stderr)
+            proc_reader = utils.ProcReader(proc, self.stdout, sys.stderr)
             proc_reader.wait()
 
             # Save the return code of the application for use in a pyscript
@@ -5029,7 +5050,7 @@ class Cmd(cmd.Cmd):
         history_action_group.add_argument('-e', '--edit', action='store_true', help='edit and then run selected history items')
         history_action_group.add_argument(
             '-o',
-            '--output_file',
+            '--output-file',
             metavar='FILE',
             help='output commands to a script file, implies -s',
             completer=cls.path_complete,
@@ -5359,7 +5380,7 @@ class Cmd(cmd.Cmd):
                 transcript += command
 
                 # Use a StdSim object to capture output
-                stdsim = utils.StdSim(cast(TextIO, self.stdout))
+                stdsim = utils.StdSim(self.stdout)
                 self.stdout = cast(TextIO, stdsim)
 
                 # then run the command and let the output go into our buffer
@@ -5385,7 +5406,7 @@ class Cmd(cmd.Cmd):
             with self.sigint_protection:
                 # Restore altered attributes to their original state
                 self.echo = saved_echo
-                self.stdout = cast(TextIO, saved_stdout)
+                self.stdout = saved_stdout
 
         # Check if all commands ran
         if commands_run < len(history):
@@ -5880,11 +5901,10 @@ class Cmd(cmd.Cmd):
         """
         self.perror(message_to_print, style=None)
 
-    def cmdloop(self, intro: str | None = None) -> int:  # type: ignore[override]
+    def cmdloop(self, intro: RenderableType = '') -> int:
         """Deal with extra features provided by cmd2, this is an outer wrapper around _cmdloop().
 
-        _cmdloop() provides the main loop equivalent to cmd.cmdloop().  This is a wrapper around that which deals with
-        the following extra features provided by cmd2:
+        _cmdloop() provides the main loop.  This provides the following extra features provided by cmd2:
         - transcript testing
         - intro banner
         - exit code
@@ -5922,11 +5942,11 @@ class Cmd(cmd.Cmd):
             self._run_transcript_tests([os.path.expanduser(tf) for tf in self._transcript_files])
         else:
             # If an intro was supplied in the method call, allow it to override the default
-            if intro is not None:
+            if intro:
                 self.intro = intro
 
             # Print the intro, if there is one, right after the preloop
-            if self.intro is not None:
+            if self.intro:
                 self.poutput(self.intro)
 
             # And then call _cmdloop() to enter the main loop

{cmd2-3.0.0rc1 → cmd2-3.1.0}/cmd2/parsing.py

@@ -105,10 +105,10 @@ class Statement(str):  # noqa: SLOT000
        whether positional or denoted with switches.
 
     2. For commands with simple positional arguments, use
-       [args][cmd2.Statement.args] or [arg_list][cmd2.Statement.arg_list]
+       [args][cmd2.parsing.Statement.args] or [arg_list][cmd2.parsing.Statement.arg_list]
 
     3. If you don't want to have to worry about quoted arguments, see
-       [argv][cmd2.Statement.argv] for a trick which strips quotes off for you.
+       [argv][cmd2.parsing.Statement.argv] for a trick which strips quotes off for you.
     """
 
     # the arguments, but not the command, nor the output redirection clauses.
@@ -193,7 +193,7 @@ class Statement(str):  # noqa: SLOT000
 
     @property
     def expanded_command_line(self) -> str:
-        """Concatenate [command_and_args][cmd2.Statement.command_and_args] and [post_command][cmd2.Statement.post_command]."""
+        """Concatenate [cmd2.parsing.Statement.command_and_args]() and [cmd2.parsing.Statement.post_command]()."""
         return self.command_and_args + self.post_command
 
     @property

{cmd2-3.0.0rc1 → cmd2-3.1.0}/cmd2/py_bridge.py

@@ -137,7 +137,7 @@ class PyBridge:
                 )
         finally:
             with self._cmd2_app.sigint_protection:
-                self._cmd2_app.stdout = cast(IO[str], copy_cmd_stdout.inner_stream)
+                self._cmd2_app.stdout = cast(TextIO, copy_cmd_stdout.inner_stream)
                 if stdouts_match:
                     sys.stdout = self._cmd2_app.stdout
 

{cmd2-3.0.0rc1 → cmd2-3.1.0}/cmd2/transcript.py

@@ -46,7 +46,7 @@ class Cmd2TestCase(unittest.TestCase):
 
             # Trap stdout
             self._orig_stdout = self.cmdapp.stdout
-            self.cmdapp.stdout = cast(TextIO, utils.StdSim(cast(TextIO, self.cmdapp.stdout)))
+            self.cmdapp.stdout = cast(TextIO, utils.StdSim(self.cmdapp.stdout))
 
     def tearDown(self) -> None:
         """Instructions that will be executed after each test method."""

{cmd2-3.0.0rc1 → cmd2-3.1.0}/cmd2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmd2
-Version: 3.0.0rc1
+Version: 3.1.0
 Summary: cmd2 - quickly build feature-rich and user-friendly interactive command line applications in Python
 Author: cmd2 Contributors
 License-Expression: MIT
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Free Threading :: 3 - Stable
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
@@ -23,7 +24,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: backports.strenum; python_version == "3.10"
 Requires-Dist: gnureadline>=8; platform_system == "Darwin"
-Requires-Dist: pyperclip>=1.8
+Requires-Dist: pyperclip>=1.8.2
 Requires-Dist: pyreadline3>=3.4; platform_system == "Windows"
 Requires-Dist: rich>=14.1.0
 Requires-Dist: rich-argparse>=1.7.1
@@ -56,10 +57,10 @@ applications. It provides a simple API which is an extension of Python's built-i
 of cmd to make your life easier and eliminates much of the boilerplate code which would be necessary
 when using cmd.
 
-> :warning: **cmd2 is now "feature complete" for the `2.x` branch and is actively working on the
-> 3.0.0 release on the `main` branch. New features will only be addressed in 3.x moving forwards. If
-> need be, we will still fix bugs in 2.x. A beta version, 3.0.0b2, is available for testing and we
-> would appreciate feedback.**
+> :warning: **`cmd2` 3.0.0 has been released and there are some significant backwards
+> incompatibilities from version `2.x`. Please see the
+> [Migration Guide](https://cmd2.readthedocs.io/en/latest/upgrades/) for tips on upgrading from
+> `cmd2` 2.x to 3.x.**
 
 ## The developers toolbox
 

{cmd2-3.0.0rc1 → cmd2-3.1.0}/cmd2.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pyperclip>=1.8
+pyperclip>=1.8.2
 rich>=14.1.0
 rich-argparse>=1.7.1
 

cmd2-3.1.0/docs/examples/examples.md

@@ -0,0 +1,3 @@
+# List of cmd2 examples
+
+--8<-- "docs/../examples/README.md"

{cmd2-3.0.0rc1 → cmd2-3.1.0}/docs/examples/getting_started.md

@@ -19,9 +19,7 @@ click the **Copy** button in the top-right):
 !!! example "getting_started.py"
 
     ```py
-    {%
-        include "../../examples/getting_started.py"
-    %}
+    --8<-- "examples/getting_started.py"
     ```
 
 ## Basic Application

{cmd2-3.0.0rc1 → cmd2-3.1.0}/docs/features/generating_output.md

@@ -71,7 +71,7 @@ def do_echo(self, args):
 
 When an error occurs in your program, you can display it on `sys.stderr` by calling the
 [perror][cmd2.Cmd.perror] method. By default this method applies
-[Cmd2Style.ERROR][cmd2.Cmd2Style.ERROR] to the output.
+[Cmd2Style.ERROR][cmd2.styles.Cmd2Style.ERROR] to the output.
 
 ## Warning Messages
 

{cmd2-3.0.0rc1 → cmd2-3.1.0}/docs/features/history.md

@@ -189,7 +189,7 @@ each command. This is great when displaying history to the screen because it giv
 reference to identify previously entered commands. However, when creating a script or a transcript,
 the command numbers would prevent the script from loading properly. The `-s` or `--script` option
 instructs the `history` command to suppress the line numbers. This option is automatically set by
-the `--output_file`, `--transcript`, and `--edit` options. If you want to output the history
+the `--output-file`, `--transcript`, and `--edit` options. If you want to output the history
 commands with line numbers to a file, you can do it with output redirection:
 
     (Cmd) history 1:4 > history.txt

{cmd2-3.0.0rc1 → cmd2-3.1.0}/docs/features/initialization.md

@@ -5,9 +5,7 @@ Here is a basic example `cmd2` application which demonstrates many capabilities
 !!! example "examples/getting_started.py"
 
     ```py
-    {%
-        include "../../examples/getting_started.py"
-    %}
+    --8<-- "examples/getting_started.py"
     ```
 
 ## Cmd class initializer

{cmd2-3.0.0rc1 → cmd2-3.1.0}/docs/features/modular_commands.md

@@ -211,22 +211,23 @@ if __name__ == '__main__':
 The following functions are called at different points in the [CommandSet][cmd2.CommandSet] life
 cycle.
 
-[on_register][cmd2.CommandSet.on_register] - Called by `cmd2.Cmd` as the first step to registering a
-`CommandSet`. The commands defined in this class have not be added to the CLI object at this point.
-Subclasses can override this to perform any initialization requiring access to the Cmd object (e.g.
-configure commands and their parsers based on CLI state data).
-
-[on_registered][cmd2.CommandSet.on_registered] - Called by `cmd2.Cmd` after a `CommandSet` is
-registered and all its commands have been added to the CLI. Subclasses can override this to perform
-custom steps related to the newly added commands (e.g. setting them to a disabled state).
-
-[on_unregister][cmd2.CommandSet.on_unregister] - Called by `cmd2.Cmd` as the first step to
-unregistering a `CommandSet`. Subclasses can override this to perform any cleanup steps which
-require their commands being registered in the CLI.
-
-[on_unregistered][cmd2.CommandSet.on_unregistered] - Called by `cmd2.Cmd` after a `CommandSet` has
-been unregistered and all its commands removed from the CLI. Subclasses can override this to perform
-remaining cleanup steps.
+[on_register][cmd2.command_definition.CommandSet.on_register] - Called by `cmd2.Cmd` as the first
+step to registering a `CommandSet`. The commands defined in this class have not be added to the CLI
+object at this point. Subclasses can override this to perform any initialization requiring access to
+the Cmd object (e.g. configure commands and their parsers based on CLI state data).
+
+[on_registered][cmd2.command_definition.CommandSet.on_registered] - Called by `cmd2.Cmd` after a
+`CommandSet` is registered and all its commands have been added to the CLI. Subclasses can override
+this to perform custom steps related to the newly added commands (e.g. setting them to a disabled
+state).
+
+[on_unregister][cmd2.command_definition.CommandSet.on_unregister] - Called by `cmd2.Cmd` as the
+first step to unregistering a `CommandSet`. Subclasses can override this to perform any cleanup
+steps which require their commands being registered in the CLI.
+
+[on_unregistered][cmd2.command_definition.CommandSet.on_unregistered] - Called by `cmd2.Cmd` after a
+`CommandSet` has been unregistered and all its commands removed from the CLI. Subclasses can
+override this to perform remaining cleanup steps.
 
 ## Injecting Subcommands
 

{cmd2-3.0.0rc1 → cmd2-3.1.0}/docs/features/settings.md

@@ -105,9 +105,7 @@ Here's an example, from
 !!! example "examples/environment.py"
 
     ```py
-    {%
-      include "../../examples/environment.py"
-    %}
+    --8<-- "examples/environment.py"
     ```
 
 If you want to be notified when a setting changes (as we do above), then be sure to supply a method