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

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

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

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

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

{lockss_pybasic-0.1.0.dev20 → lockss_pybasic-0.1.0.dev22}/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-dev20'
+__version__ = '0.1.0-dev22'

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

@@ -32,13 +32,13 @@
 Command line utilities.
 """
 
-from argparse import _A
 from collections.abc import Callable
 import sys
 from typing import Any, Dict, Generic, Optional, TypeVar
 
-from pydantic.v1 import BaseModel, Field
+from pydantic.v1 import BaseModel
 from pydantic_argparse import ArgumentParser
+from pydantic_argparse.argparse.actions import SubParsersAction
 from rich_argparse import RichHelpFormatter
 
 class ActionCommand(Callable, BaseModel):
@@ -101,7 +101,7 @@ class BaseCli(Generic[BaseModelT]):
            ``prog`` and ``description`` from the constructor keyword
            arguments in ``self.parser``.
 
-        *  Stores the Pydantic-Argparse parsed arguemnts in ``self.args``.
+        *  Stores the Pydantic-Argparse parsed arguments in ``self.args``.
 
         *  Calls ``dispatch()``.
 
@@ -145,9 +145,11 @@ class BaseCli(Generic[BaseModelT]):
             })
         def __add_formatter_class(container):
             container.formatter_class = RichHelpFormatter
-            if container._subparsers:
-                for x in container._subparsers:
-                    __add_formatter_class(x)
+            if hasattr(container, '_actions'):
+                for action in container._actions:
+                    if issubclass(type(action), SubParsersAction):
+                        for subaction in action.choices.values():
+                            __add_formatter_class(subaction)
         __add_formatter_class(self._parser)