lockss-pybasic 0.1.0.dev19__tar.gz → 0.1.0.dev21__tar.gz

{lockss_pybasic-0.1.0.dev19 → lockss_pybasic-0.1.0.dev21}/PKG-INFO

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

{lockss_pybasic-0.1.0.dev19 → lockss_pybasic-0.1.0.dev21}/pyproject.toml

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

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

{lockss_pybasic-0.1.0.dev19 → lockss_pybasic-0.1.0.dev21}/src/lockss/pybasic/cliutil.py

@@ -36,7 +36,7 @@ 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 rich_argparse import RichHelpFormatter
 
@@ -100,7 +100,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()``.
 
@@ -142,12 +142,12 @@ class BaseCli(Generic[BaseModelT]):
                 'argparse.metavar': f'bold {cls.styles["argparse.metavar"]}',
                 'argparse.prog': f'bold {cls.styles["argparse.prog"]}',
             })
-        def _add_formatter_class(container):
+        def __add_formatter_class(container):
             container.formatter_class = RichHelpFormatter
-            if container._subcommands:
-                for subcommand in container._subcommands:
-                    _add_formatter_class(subcommand)
-        _add_formatter_class(self._parser)
+            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]: