Merge branch 'master' into 3.0.0

Thorny merge. What complicated it was the macro stuff being deleted in 3.0 but present in master.

Author: tleonhardt

CHANGELOG.md

@@ -15,6 +15,7 @@
 
 - Breaking Change
     - `cmd2` 2.6 supports Python 3.9+ (removed support for Python 3.8)
+    - Renamed methods in `cmd2.ansi.Cursor` to make it clear they are intended for internal use only as was documented
 - Enhancements
     - Add support for Python 3.14
 

Makefile

@@ -13,6 +13,18 @@ check: ## Run code quality tools.
 	@echo "🚀 Static type checking: Running mypy"
 	@uv run mypy
 
+.PHONY: format
+format: ## Perform ruff formatting
+	@uv run ruff format
+
+.PHONY: lint
+lint: ## Perform ruff linting
+	@uv run ruff check --fix
+
+.PHONY: typecheck
+typecheck: ## Perform type checking
+	@uv run mypy
+
 .PHONY: test
 test: ## Test the code with pytest.
 	@echo "🚀 Testing code: Running pytest"

cmd2/__init__.py

@@ -1,17 +1,15 @@
-#
-# -*- coding: utf-8 -*-
-# flake8: noqa F401
 """This simply imports certain things for backwards compatibility."""
 
+import argparse
 import importlib.metadata as importlib_metadata
+import sys
 
 try:
     __version__ = importlib_metadata.version(__name__)
 except importlib_metadata.PackageNotFoundError:  # pragma: no cover
     # package is not installed
     pass
 
-from . import plugin
 from .ansi import (
     Bg,
     Cursor,
@@ -31,21 +29,20 @@
     register_argparse_argument_parameter,
     set_default_argument_parser_type,
 )
+
+# Check if user has defined a module that sets a custom value for argparse_custom.DEFAULT_ARGUMENT_PARSER.
+# Do this before loading cmd2.Cmd class so its commands use the custom parser.
+cmd2_parser_module = getattr(argparse, 'cmd2_parser_module', None)
+if cmd2_parser_module is not None:
+    import importlib
+
+    importlib.import_module(cmd2_parser_module)
+
+from . import plugin
 from .cmd2 import Cmd
-from .command_definition import (
-    CommandSet,
-    with_default_category,
-)
-from .constants import (
-    COMMAND_NAME,
-    DEFAULT_SHORTCUTS,
-)
-from .decorators import (
-    as_subcommand_to,
-    with_argparser,
-    with_argument_list,
-    with_category,
-)
+from .command_definition import CommandSet, with_default_category
+from .constants import COMMAND_NAME, DEFAULT_SHORTCUTS
+from .decorators import as_subcommand_to, with_argparser, with_argument_list, with_category
 from .exceptions import (
     Cmd2ArgparseError,
     CommandSetRegistrationError,
@@ -55,12 +52,7 @@
 )
 from .parsing import Statement
 from .py_bridge import CommandResult
-from .utils import (
-    CompletionMode,
-    CustomCompletionSettings,
-    Settable,
-    categorize,
-)
+from .utils import CompletionMode, CustomCompletionSettings, Settable, categorize
 
 __all__: list[str] = [
     'COMMAND_NAME',