wizlib 3.1.0__py3-none-any.whl → 3.1.2__py3-none-any.whl

wizlib/app.py

@@ -1,3 +1,4 @@
+from argparse import ArgumentError
 import sys
 from dataclasses import dataclass
 import os
@@ -6,7 +7,7 @@ from pathlib import Path
 from wizlib.class_family import ClassFamily
 from wizlib.command import WizHelpCommand
 from wizlib.super_wrapper import SuperWrapper
-from wizlib.parser import WizParser
+from wizlib.parser import WizArgumentError, WizParser
 from wizlib.ui import UI
 
 
@@ -44,7 +45,12 @@ class WizApp:
         """Call this from a Python entrypoint"""
         try:
             cls.initialize()
-            ns = cls.parser.parse_args(args)
+            try:
+                ns = cls.parser.parse_args(args)
+                if (ns.command is None) and (not hasattr(ns, 'help')):
+                    ns = cls.dparser.parse_args(args)
+            except ArgumentError as e:
+                ns = cls.dparser.parse_args(args)
             app = cls(**vars(ns))
             app.run(**vars(ns))
         except AppCancellation as cancellation:
@@ -63,14 +69,17 @@ class WizApp:
     def initialize(cls):
         """Set up the parser for the app class"""
         cls.parser = WizParser(prog=cls.name)
-        for handler in cls.handlers:
-            handler.add_args(cls.parser)
         subparsers = cls.parser.add_subparsers(dest='command')
         for command in cls.base.family_members('name'):
             key = command.get_member_attr('key')
             aliases = [key] if key else []
             subparser = subparsers.add_parser(command.name, aliases=aliases)
+            if command.name == cls.base.default:
+                cls.dparser = subparser
             command.add_args(subparser)
+        for handler in cls.handlers:
+            handler.add_args(cls.parser)
+            handler.add_args(cls.dparser)
 
     def __init__(self, **vals):
         """Create the app. Only interested in the handlers from the parsed
@@ -86,12 +95,13 @@ class WizApp:
         the command itself and its specific arguments from the values passed
         in."""
         if 'help' in vals:
-            return WizHelpCommand(**vals)
-        c = 'command'
-        cname = (vals.pop(c) if c in vals else None) or self.base.default
-        ccls = self.base.family_member('name', cname)
-        if not ccls:
-            raise Exception(f"Unknown command {cname}")
+            ccls = WizHelpCommand
+        else:
+            c = 'command'
+            cname = (vals.pop(c) if c in vals else None) or self.base.default
+            ccls = self.base.family_member('name', cname)
+            if not ccls:
+                raise Exception(f"Unknown command {cname}")
         command = ccls(self, **vals)
         result = command.execute()
         if result:
@@ -100,3 +110,8 @@ class WizApp:
                 print()
         if command.status:
             print(command.status, file=sys.stderr)
+
+    def parse_run(self, *args):
+        """For testing, parse just the command part and tun"""
+        ns = self.parser.parse_args(args)
+        self.run(**vars(ns))

wizlib/parser.py

@@ -14,6 +14,8 @@ import sys
 import os
 
 
+# We found the help process a little clumsy
+
 class WizHelpAction(Action):
 
     def __init__(self,

wizlib/super_wrapper.py

@@ -5,4 +5,5 @@ class SuperWrapper:
         def wrapper(self, *args, **kwargs):
             parent_method = getattr(parent_class, method.__name__)
             return parent_method(self, method, *args, **kwargs)
+        wrapper.__name__ = method.__name__
         return wrapper

{wizlib-3.1.0.dist-info → wizlib-3.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizlib
-Version: 3.1.0
+Version: 3.1.2
 Summary: Framework for flexible and powerful command-line applications
 License: MIT
 Author: Steampunk Wizard

{wizlib-3.1.0.dist-info → wizlib-3.1.2.dist-info}/RECORD

@@ -1,19 +1,19 @@
 wizlib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wizlib/app.py,sha256=Sb35ib0UzB-84l9JRjAkBbOhpHekUbiJcNL7Gkr35Pg,3350
+wizlib/app.py,sha256=imR_lfyQtYzKObu1tLZVGgJQGmdz43M7E9qAMMokyD4,3962
 wizlib/class_family.py,sha256=tORSVAaPeWTQMcz2DX-MQClj1GQR3vCmkALPXxHa_pk,4506
 wizlib/command.py,sha256=NO1558EYuXxfkpSmX6ljjzae8n8g4w6yytZKTJtigvo,1708
 wizlib/config_handler.py,sha256=hoDavSMiGM_7PAHI8XIwC8nxPWOZDk302ryyjluoLGg,2588
 wizlib/error.py,sha256=ypwdMOYhtgKWd48ccfOX8idmCXmm-Skwx3gkPwqJB3c,46
 wizlib/handler.py,sha256=Oz80aPhDyeY9tdppZ1dvtN-19JU5ydEDVW6jtppVoD4,446
-wizlib/parser.py,sha256=O34azN4ttVfwwAsza0hujxGxDpzc4xUEVAf26DXJS5g,1505
+wizlib/parser.py,sha256=yLHV0fENeApFomCRWa3I6sB1x4lk1ag4vKejWVsic64,1550
 wizlib/stream_handler.py,sha256=i1EgcBrDiYhFK-CI8At7JtUtMCNunJmSkJLSlili-as,663
-wizlib/super_wrapper.py,sha256=F834ytHqA7zegTD1ezk_uxlF9PLygh84wReuiqcI7BI,272
+wizlib/super_wrapper.py,sha256=msitlfFfEwnrskzTtQBEY975sh9TQPicdLVo67imuqU,315
 wizlib/ui/__init__.py,sha256=ve_p_g4aBujh4jIJMgKkJ6cE5PT0aeY5AgRlneDswGg,4241
 wizlib/ui/shell/__init__.py,sha256=sPrYe4bG_Xf7Nwssx_dqXVk9jeyYBFUjh4oLdlSOeRY,943
 wizlib/ui/shell/line_editor.py,sha256=frpsqU5NggcvEz3XeB8YyqgmlExlyx6K1CKPzvARtPk,7419
 wizlib/ui/shell_ui.py,sha256=f2GErMJg09GPZDS4uK0q8Qq8WEssQFP1dqQyg4ycznI,2029
 wizlib/ui_handler.py,sha256=JoZadtw9DKAtGvHKP3_BJF2NaYqmcQYNdsY4PeRnOjg,634
 wizlib/util.py,sha256=x1SyL3iXot0ET2r8Jjb2ySTd_J-3Uu7J1b_CHvFgzew,156
-wizlib-3.1.0.dist-info/METADATA,sha256=9xX6eax7rHG8yulshf0MVGfNYLLbmxFsmx-JO9ddTW0,1780
-wizlib-3.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-wizlib-3.1.0.dist-info/RECORD,,
+wizlib-3.1.2.dist-info/METADATA,sha256=4HzwBU_sp2F4ycdTb1XvCTDO5i7DeIMdOhl63JfCzNs,1780
+wizlib-3.1.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+wizlib-3.1.2.dist-info/RECORD,,