pyxcp 0.23.8__cp313-cp313-macosx_11_0_arm64.whl → 0.25.7__cp313-cp313-macosx_11_0_arm64.whl

pyxcp/__init__.py

@@ -17,4 +17,4 @@ tb_install(show_locals=True, max_frames=3)  # Install custom exception handler.
 
 # if you update this manually, do not forget to update
 # .bumpversion.cfg and pyproject.toml.
-__version__ = "0.23.8"
+__version__ = "0.25.7"

pyxcp/cmdline.py

@@ -4,9 +4,8 @@ Parse (transport-layer specific) command line parameters
 and create a XCP master instance.
 """
 
+import argparse
 import warnings
-from dataclasses import dataclass
-from typing import List
 
 from pyxcp.config import (  # noqa: F401
     create_application,
@@ -14,33 +13,12 @@ from pyxcp.config import (  # noqa: F401
     reset_application,
 )
 from pyxcp.master import Master
+from pyxcp.utils.cli import StrippingParser
 
 
 warnings.simplefilter("always")
 
 
-@dataclass
-class Option:
-    short_opt: str
-    long_opt: str = ""
-    dest: str = ""
-    help: str = ""
-    type: str = ""
-    default: str = ""
-    action: str = ""
-
-
-class FakeParser:
-    """Parser that collects arguments for later processing."""
-
-    def __init__(self):
-        self.options = []
-
-    def add_argument(self, short_opt, long_opt="", dest="", help="", type=None, default=None, action=None):
-        """Collect argument definitions without issuing warnings."""
-        self.options.append(Option(short_opt, long_opt, dest, help, type, default, action))
-
-
 class ArgumentParser:
     """Argument parser for pyXCP applications.
 
@@ -49,10 +27,17 @@ class ArgumentParser:
     the parsed arguments.
     """
 
-    def __init__(self, callout=None, description=None, *args, **kws):
-        self._parser = FakeParser()
-        self._callout = callout
+    def __init__(self, user_parser=None, description=None, *args, **kws):
+        if isinstance(user_parser, argparse.ArgumentParser):
+            self._parser = StrippingParser(user_parser)
+            self._callout = None
+        else:
+            # Create a default parser. user_parser might be a callout function or None.
+            parser = argparse.ArgumentParser(description=description)
+            self._parser = StrippingParser(parser)
+            self._callout = user_parser
         self._description = description
+        self.args = self._parser.parse_and_strip()
 
     def run(self, policy=None, transport_layer_interface=None):
         """Create and configure a synchronous master instance.
@@ -65,7 +50,7 @@ class ArgumentParser:
             A configured master instance
         """
         # Create the application with custom arguments and callout
-        application = get_application(self.parser.options, self._callout)
+        application = get_application(options=[], callout=self._callout)
 
         # Create the master instance
         master = Master(
@@ -81,4 +66,4 @@ class ArgumentParser:
 
     @property
     def parser(self):
-        return self._parser
+        return self._parser.parser