lockss-pybasic 0.1.0.dev18__tar.gz → 0.1.0.dev20__tar.gz

{lockss_pybasic-0.1.0.dev18 → lockss_pybasic-0.1.0.dev20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-pybasic
-Version: 0.1.0.dev18
+Version: 0.1.0.dev20
 Summary: Basic Python utilities
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin

{lockss_pybasic-0.1.0.dev18 → lockss_pybasic-0.1.0.dev20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lockss-pybasic"
-version = "0.1.0-dev18"
+version = "0.1.0-dev20"
 description = "Basic Python utilities"
 authors = [
     { name = "Thib Guicherd-Callin", email = "thib@cs.stanford.edu" }

{lockss_pybasic-0.1.0.dev18 → lockss_pybasic-0.1.0.dev20}/src/lockss/pybasic/__init__.py

@@ -36,4 +36,4 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 '''.strip()
 
-__version__ = '0.1.0-dev18'
+__version__ = '0.1.0-dev20'

{lockss_pybasic-0.1.0.dev18 → lockss_pybasic-0.1.0.dev20}/src/lockss/pybasic/cliutil.py

@@ -32,6 +32,7 @@
 Command line utilities.
 """
 
+from argparse import _A
 from collections.abc import Callable
 import sys
 from typing import Any, Dict, Generic, Optional, TypeVar
@@ -134,7 +135,7 @@ class BaseCli(Generic[BaseModelT]):
         else:
             self._parser.error(f'unknown command; expected one of {', '.join(field_names)}')
 
-    def _initialize_rich_argparse(self):
+    def _initialize_rich_argparse(self) -> None:
         for cls in [RichHelpFormatter]:
             cls.styles.update({
                 'argparse.args': f'bold {cls.styles["argparse.args"]}',
@@ -142,7 +143,12 @@ class BaseCli(Generic[BaseModelT]):
                 'argparse.metavar': f'bold {cls.styles["argparse.metavar"]}',
                 'argparse.prog': f'bold {cls.styles["argparse.prog"]}',
             })
-        self._parser.formatter_class = RichHelpFormatter
+        def __add_formatter_class(container):
+            container.formatter_class = RichHelpFormatter
+            if container._subparsers:
+                for x in container._subparsers:
+                    __add_formatter_class(x)
+        __add_formatter_class(self._parser)
 
 
 def at_most_one_from_enum(model_cls, values: Dict[str, Any], enum_cls) -> Dict[str, Any]: