lockss-pybasic 0.1.0.dev20__py3-none-any.whl → 0.1.0.dev22__py3-none-any.whl

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/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)
 
 

{lockss_pybasic-0.1.0.dev20.dist-info → lockss_pybasic-0.1.0.dev22.dist-info}/METADATA

@@ -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.dev22.dist-info/RECORD

@@ -0,0 +1,9 @@
+lockss/pybasic/__init__.py,sha256=_J-oMvR7ECgXrb8v7tZOObxiHQ-m8qNjpSUbnebj1Bw,1679
+lockss/pybasic/cliutil.py,sha256=aH401DqDLoiXX-Dqgt-tWMbO7N_HfRry0knWG2wZlm8,9024
+lockss/pybasic/errorutil.py,sha256=OJqRGOjzKK8_OTJCq77u0_XZ5ti2BoVidk5jSTMB6xg,1882
+lockss/pybasic/fileutil.py,sha256=O_EcxobrHPLeD7lAlvtYOkd0R2NOIvpGK6mZOZTxyG4,2856
+lockss/pybasic/outpututil.py,sha256=S2Jpcj7IctXoA10OFGueNzcd7fMjj6RARpc6s15_xLY,2347
+lockss_pybasic-0.1.0.dev22.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
+lockss_pybasic-0.1.0.dev22.dist-info/METADATA,sha256=9RUVx0yb9j5-0eoNOcGlphRIDSlaJePUx6dRfW3U3ng,784
+lockss_pybasic-0.1.0.dev22.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lockss_pybasic-0.1.0.dev22.dist-info/RECORD,,

lockss_pybasic-0.1.0.dev20.dist-info/RECORD

@@ -1,9 +0,0 @@
-lockss/pybasic/__init__.py,sha256=ue6QyioPqViKNCBx_1HZ9sX9XeWuvVqgkLFteXsUB-8,1679
-lockss/pybasic/cliutil.py,sha256=DsA58QnSDQfwNcxs8AeRlPNPidwLr5ROmbCHAFhCHwE,8831
-lockss/pybasic/errorutil.py,sha256=OJqRGOjzKK8_OTJCq77u0_XZ5ti2BoVidk5jSTMB6xg,1882
-lockss/pybasic/fileutil.py,sha256=O_EcxobrHPLeD7lAlvtYOkd0R2NOIvpGK6mZOZTxyG4,2856
-lockss/pybasic/outpututil.py,sha256=S2Jpcj7IctXoA10OFGueNzcd7fMjj6RARpc6s15_xLY,2347
-lockss_pybasic-0.1.0.dev20.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
-lockss_pybasic-0.1.0.dev20.dist-info/METADATA,sha256=JAIudyRPRqCraTCpBUFq0-E96z9D8I8E6FPcrq-aFyI,784
-lockss_pybasic-0.1.0.dev20.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lockss_pybasic-0.1.0.dev20.dist-info/RECORD,,