dissect.target 3.23.dev60__tar.gz → 3.23.dev61__tar.gz

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev60
+Version: 3.23.dev61
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/helpers/docs.py

@@ -118,7 +118,7 @@ def _get_real_func_obj(func: Callable) -> tuple[type[Plugin], Callable]:
         func = func.fget
 
     if inspect.ismethod(func):
-        for klass in inspect.getmro(func.__self__.__class__):
+        for klass in func.__self__.__class__.__mro__:
             if func.__name__ in klass.__dict__:
                 break
         else:

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/plugins/general/loaders.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import json
+import json as jsonlib
 
 from dissect.target.helpers.docs import INDENT_STEP, get_docstring
 from dissect.target.loader import LOADERS_BY_SCHEME
@@ -14,12 +14,8 @@ class LoaderListPlugin(Plugin):
         pass
 
     @export(output="none")
-    # NOTE: We would prefer to re-use arguments across plugins from argparse in query.py, but that is not possible yet.
-    # For now we use --as-json, but in the future this should be changed to inherit --json from target-query.
-    # https://github.com/fox-it/dissect.target/pull/841
-    # https://github.com/fox-it/dissect.target/issues/889
-    @arg("--as-json", dest="as_json", action="store_true", help="output in JSON format")
-    def loaders(self, as_json: bool = False) -> None:
+    @arg("-j", "--json", action="store_true", help="output in JSON format")
+    def loaders(self, json: bool = False) -> None:
         """List the available loaders."""
 
         loaders_info = {}
@@ -32,8 +28,8 @@ class LoaderListPlugin(Plugin):
 
         loaders = sorted(loaders_info.items())
 
-        if as_json:
-            print(json.dumps([{"name": name, "description": desc} for name, desc in loaders]), end="")
+        if json:
+            print(jsonlib.dumps([{"name": name, "description": desc} for name, desc in loaders]), end="")
 
         else:
             print("Available loaders:")

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/plugins/general/plugins.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import json
+import json as jsonlib
 import textwrap
 
 from dissect.target import plugin
@@ -92,7 +92,7 @@ def generate_functions_json(functions: list[plugin.FunctionDescriptor] | None =
     if failures := plugin.failed():
         failed = [{"module": f.module, "stacktrace": "".join(f.stacktrace)} for f in failures]
 
-    return json.dumps({"loaded": loaded, "failed": failed})
+    return jsonlib.dumps({"loaded": loaded, "failed": failed})
 
 
 def _get_os_functions() -> list[plugin.FunctionDescriptor]:
@@ -162,14 +162,10 @@ class PluginListPlugin(Plugin):
 
     @export(output="none", cache=False)
     @arg("--docs", dest="print_docs", action="store_true", help="output docstrings")
-    # NOTE: We would prefer to re-use arguments across plugins from argparse in query.py, but that is not possible yet.
-    # For now we use --as-json, but in the future this should be changed to inherit --json from target-query.
-    # https://github.com/fox-it/dissect.target/pull/841
-    # https://github.com/fox-it/dissect.target/issues/889
-    @arg("--as-json", dest="as_json", action="store_true", help="output in JSON format")
-    def plugins(self, print_docs: bool = False, as_json: bool = False) -> None:
+    @arg("-j", "--json", action="store_true", help="output in JSON format")
+    def plugins(self, print_docs: bool = False, json: bool = False) -> None:
         """Print all available plugins."""
-        if as_json:
+        if json:
             print(generate_functions_json(), end="")
         else:
             print(generate_functions_overview(include_docs=print_docs))

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/plugins/os/unix/esxi/_os.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import gzip
-import json
+import json as jsonlib
 import lzma
 import struct
 import subprocess
@@ -189,12 +189,12 @@ class ESXiPlugin(UnixPlugin):
 
     @export(output="none")
     @arg("path", help="config path")
-    @arg("--as-json", action="store_true", help="format as json")
-    def esxconf(self, path: str, as_json: bool) -> None:
+    @arg("-j", "--json", action="store_true", help="output in JSON format")
+    def esxconf(self, path: str, json: bool) -> None:
         obj = self._cfg(path)
 
-        if as_json:
-            print(json.dumps(obj, indent=4, sort_keys=True))
+        if json:
+            print(jsonlib.dumps(obj, indent=4, sort_keys=True))
         else:
             print(obj)
 
@@ -578,11 +578,11 @@ def parse_config_store(fh: BinaryIO) -> dict[str, Any]:
             identifier["creation_time"] = row.CreationTime
             identifier["version"] = row.Version
             identifier["success"] = row.Success
-            identifier["auto_conf_value"] = json.loads(row.AutoConfValue) if row.AutoConfValue else None
-            identifier["user_value"] = json.loads(row.UserValue) if row.UserValue else None
-            identifier["vital_value"] = json.loads(row.VitalValue) if row.VitalValue else None
-            identifier["cached_value"] = json.loads(row.CachedValue) if row.CachedValue else None
-            identifier["desired_value"] = json.loads(row.DesiredValue) if row.DesiredValue else None
+            identifier["auto_conf_value"] = jsonlib.loads(row.AutoConfValue) if row.AutoConfValue else None
+            identifier["user_value"] = jsonlib.loads(row.UserValue) if row.UserValue else None
+            identifier["vital_value"] = jsonlib.loads(row.VitalValue) if row.VitalValue else None
+            identifier["cached_value"] = jsonlib.loads(row.CachedValue) if row.CachedValue else None
+            identifier["desired_value"] = jsonlib.loads(row.DesiredValue) if row.DesiredValue else None
             identifier["revision"] = row.Revision
 
     return store

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/dd.py

@@ -35,8 +35,8 @@ def main() -> int:
     parser.add_argument("-b", "--bytes", type=int, default=-1, help="amount of bytes to read")
     configure_generic_arguments(parser)
 
-    args, rest = parser.parse_known_args()
-    process_generic_arguments(args, rest)
+    args, _ = parser.parse_known_args()
+    process_generic_arguments(args)
 
     try:
         t = Target.open(args.target)

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/diff.py

@@ -37,7 +37,7 @@ from dissect.target.tools.shell import (
 from dissect.target.tools.utils import (
     catch_sigpipe,
     configure_generic_arguments,
-    generate_argparse_for_bound_method,
+    generate_argparse_for_method,
     process_generic_arguments,
 )
 
@@ -119,7 +119,7 @@ def get_plugin_output_records(plugin_name: str, plugin_arg_parts: list[str], tar
         raise ValueError("Comparing plugin output is only supported for plugins outputting records.")
 
     if callable(attr):
-        argparser = generate_argparse_for_bound_method(attr)
+        argparser = generate_argparse_for_method(attr)
         try:
             args = argparser.parse_args(plugin_arg_parts)
         except SystemExit:
@@ -965,8 +965,8 @@ def main() -> int:
 
     configure_generic_arguments(parser)
 
-    args, rest = parser.parse_known_args()
-    process_generic_arguments(args, rest)
+    args, _ = parser.parse_known_args()
+    process_generic_arguments(args)
 
     if len(args.targets) < 2:
         parser.error("at least two targets are required for target-diff")

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/dump/run.py

@@ -300,7 +300,7 @@ def parse_arguments() -> tuple[argparse.Namespace, list[str]]:
     configure_generic_arguments(parser)
 
     args, rest = parser.parse_known_args()
-    process_generic_arguments(args, rest)
+    process_generic_arguments(args)
 
     if not args.function and ("-h" in rest or "--help" in rest):
         parser.print_help()

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/fs.py

@@ -143,8 +143,8 @@ def main() -> int:
     parser_cp.set_defaults(handler=cp)
     configure_generic_arguments(parser)
 
-    args, rest = parser.parse_known_args()
-    process_generic_arguments(args, rest)
+    args, _ = parser.parse_known_args()
+    process_generic_arguments(args)
 
     if args.subcommand is None:
         parser.error("No subcommand specified")

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/info.py

@@ -58,7 +58,7 @@ def main() -> int:
     parser.add_argument("-J", "--jsonlines", action="store_true", help="output records as one-line json")
     configure_generic_arguments(parser)
 
-    args, rest = parser.parse_known_args()
+    args, _ = parser.parse_known_args()
 
     if not args.targets and not args.from_file:
         parser.error("too few arguments")
@@ -72,7 +72,7 @@ def main() -> int:
             targets = targets[:-1]
         args.targets = targets
 
-    process_generic_arguments(args, rest)
+    process_generic_arguments(args)
 
     try:
         for i, target in enumerate(Target.open_all(args.targets, include_children=args.children)):

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/mount.py

@@ -58,8 +58,8 @@ def main() -> int:
     parser.add_argument("-o", "--options", help="additional FUSE options")
     configure_generic_arguments(parser)
 
-    args, rest = parser.parse_known_args()
-    process_generic_arguments(args, rest)
+    args, _ = parser.parse_known_args()
+    process_generic_arguments(args)
 
     if not HAS_FUSE:
         log.error("fusepy is not installed: pip install fusepy")

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/qfind.py

@@ -57,8 +57,8 @@ def main() -> int:
 
     configure_generic_arguments(parser)
 
-    args, rest = parser.parse_known_args()
-    process_generic_arguments(args, rest)
+    args, _ = parser.parse_known_args()
+    process_generic_arguments(args)
 
     if not args.targets:
         log.error("No targets provided")

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/query.py

@@ -108,7 +108,7 @@ def main() -> int:
         parser.print_help()
         return 0
 
-    process_generic_arguments(args, rest)
+    process_generic_arguments(args)
 
     if args.no_cache:
         cache.IGNORE_CACHE = True
@@ -164,7 +164,7 @@ def main() -> int:
                     continue
 
                 try:
-                    output_type, result = execute_function_on_target(target, func_def, rest)
+                    output_type, result = execute_function_on_target(target, func_def)
                 except UnsupportedPluginError as e:
                     target.log.error(  # noqa: TRY400
                         "Unsupported plugin for %s: %s",

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/reg.py

@@ -41,8 +41,8 @@ def main() -> int:
     parser.add_argument("-l", "--length", type=int, default=100, help="max length of key value to print")
     configure_generic_arguments(parser)
 
-    args, rest = parser.parse_known_args()
-    process_generic_arguments(args, rest)
+    args, _ = parser.parse_known_args()
+    process_generic_arguments(args)
 
     try:
         for target in Target.open_all(args.targets):

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/shell.py

@@ -49,7 +49,7 @@ from dissect.target.tools.utils import (
     escape_str,
     execute_function_on_target,
     find_and_filter_plugins,
-    generate_argparse_for_bound_method,
+    generate_argparse_for_method,
     process_generic_arguments,
 )
 
@@ -167,7 +167,7 @@ class ExtendedCmd(cmd.Cmd):
             _, _, command = attr.partition("_")
 
             def print_help(command: str, func: Callable) -> None:
-                parser = generate_argparse_for_bound_method(func, usage_tmpl=f"{command} {{usage}}")
+                parser = generate_argparse_for_method(func, usage_tmpl=f"{command} {{usage}}")
                 parser.print_help()
 
             try:
@@ -295,7 +295,7 @@ class ExtendedCmd(cmd.Cmd):
     def _exec_command(self, command: str, command_args_str: str) -> bool:
         """Command execution helper for ``cmd_`` commands."""
         cmdfunc = getattr(self, self.CMD_PREFIX + command)
-        argparser = generate_argparse_for_bound_method(cmdfunc, usage_tmpl=f"{command} {{usage}}")
+        argparser = generate_argparse_for_method(cmdfunc, usage_tmpl=f"{command} {{usage}}")
 
         def _exec_(argparts: list[str], stdout: TextIO) -> bool:
             try:
@@ -1583,8 +1583,8 @@ def main() -> int:
     parser.add_argument("-c", "--commands", action="store", nargs="*", help="commands to execute")
     configure_generic_arguments(parser)
 
-    args, rest = parser.parse_known_args()
-    process_generic_arguments(args, rest)
+    args, _ = parser.parse_known_args()
+    process_generic_arguments(args)
 
     # For the shell tool we want -q to log slightly more then just CRITICAL messages.
     if args.quiet:

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import argparse
 import errno
 import inspect
-import json
+import json as jsonlib
 import os
 import sys
 import textwrap
@@ -58,7 +58,7 @@ def configure_generic_arguments(parser: argparse.ArgumentParser) -> None:
     )
 
 
-def process_generic_arguments(args: argparse.Namespace, rest: list[str]) -> None:
+def process_generic_arguments(args: argparse.Namespace) -> None:
     configure_logging(args.verbose, args.quiet, as_plain_text=True)
 
     if args.version:
@@ -70,7 +70,7 @@ def process_generic_arguments(args: argparse.Namespace, rest: list[str]) -> None
 
     targets = args.targets if hasattr(args, "targets") else [args.target] if hasattr(args, "target") else []
     if targets and args.loader:
-        targets = args_to_uri(targets, args.loader, rest)
+        targets = args_to_uri(targets, args.loader)
 
     if hasattr(args, "targets"):
         args.targets = targets
@@ -100,7 +100,6 @@ def configure_plugin_arguments(parser: argparse.ArgumentParser) -> None:
         help="list (matching) available plugins and loaders",
     )
     parser.add_argument(
-        "-n",
         "--dry-run",
         action="store_true",
         help="do not execute the functions, but just print which functions would be executed",
@@ -108,12 +107,13 @@ def configure_plugin_arguments(parser: argparse.ArgumentParser) -> None:
 
 
 def process_plugin_arguments(parser: argparse.ArgumentParser, args: argparse.Namespace, rest: list[str]) -> set:
-    """Processes the arguments concerting plugin functions (-f, --function) and exclusion list (-xf, --exclude-funciton)
+    """Processes the arguments concerting plugin functions (``-f``, ``--function``) and
+    exclusion list (``-xf``, ``--exclude-funciton``).
 
-    It puts the excluded function paths inside args.excluded_functions as a side effect
+    It puts the excluded function paths inside ``args.excluded_functions`` as a side effect.
 
     Returns:
-        True if there are multiple output types detected, false otherwise.
+        ``True`` if there are multiple output types detected, false otherwise.
     """
 
     # Show help for a function or in general
@@ -132,7 +132,7 @@ def process_plugin_arguments(parser: argparse.ArgumentParser, args: argparse.Nam
         if isinstance(obj, type) and issubclass(obj, Plugin):
             parser = generate_argparse_for_plugin_class(obj, usage_tmpl=USAGE_FORMAT_TMPL)
         elif isinstance(obj, (Callable, property)):
-            parser = generate_argparse_for_unbound_method(getattr(obj, "fget", obj), usage_tmpl=USAGE_FORMAT_TMPL)
+            parser = generate_argparse_for_method(getattr(obj, "fget", obj), usage_tmpl=USAGE_FORMAT_TMPL)
         else:
             parser.error(f"can't find plugin with function `{func.method_name}`")
         parser.print_help()
@@ -141,7 +141,7 @@ def process_plugin_arguments(parser: argparse.ArgumentParser, args: argparse.Nam
     # Show the list of available plugins for the given optional target and optional
     # search pattern, only display plugins that can be applied to ANY targets
     if args.list is not None:
-        list_plugins(args.targets, args.list, getattr(args, "children", False), getattr(args, "json", False), rest)
+        list_plugins(args.targets, args.list, getattr(args, "children", False), getattr(args, "json", False))
         parser.exit(0)
 
     if not args.function:
@@ -196,57 +196,11 @@ def open_targets(args: argparse.Namespace) -> Iterator[Target]:
         yield target
 
 
-def generate_argparse_for_bound_method(
-    method: Callable,
-    usage_tmpl: str | None = None,
-) -> argparse.ArgumentParser:
-    """Generate an ``argparse.ArgumentParser`` for a bound ``Plugin`` class method."""
-
-    # allow functools.partial wrapped method
-    while hasattr(method, "func"):
-        method = method.func
-
-    if not inspect.ismethod(method):
-        raise ValueError(f"Value `{method}` is not a bound plugin instance method")
-
-    unbound_method = method.__func__
-    return generate_argparse_for_unbound_method(unbound_method, usage_tmpl=usage_tmpl)
-
-
-def generate_argparse_for_unbound_method(
-    method: Callable,
-    usage_tmpl: str | None = None,
-) -> argparse.ArgumentParser:
-    """Generate an ``argparse.ArgumentParser`` for an unbound ``Plugin`` class method."""
-
-    if not inspect.isfunction(method):
-        raise ValueError(f"Value `{method}` is not an unbound plugin method")
-
-    desc = method.__doc__ or docs.get_func_description(method, with_docstrings=True)
-
-    if "\n" in desc:
-        desc = inspect.cleandoc(desc)
-
-    help_formatter = argparse.RawDescriptionHelpFormatter
-    parser = argparse.ArgumentParser(description=desc, formatter_class=help_formatter, conflict_handler="resolve")
-
-    _add_args_to_parser(parser, getattr(method, "__args__", []))
-
-    usage = parser.format_usage()
-    offset = usage.find(parser.prog) + len(parser.prog)
-    func_name = method.__name__
-    usage_tmpl = usage_tmpl or "{prog} {usage}"
-    parser.usage = usage_tmpl.format(prog=parser.prog, name=func_name, usage=usage[offset:])
-
-    return parser
-
-
 def list_plugins(
     targets: list[str] | None = None,
     patterns: str = "",
     include_children: bool = False,
-    as_json: bool = False,
-    argv: list[str] | None = None,
+    json: bool = False,
 ) -> None:
     collected = set()
     if targets or patterns:
@@ -263,12 +217,12 @@ def list_plugins(
         collected.update(_get_default_functions())
 
     target = Target()
-    fparser = generate_argparse_for_bound_method(target.plugins, usage_tmpl=USAGE_FORMAT_TMPL)
-    fargs, rest = fparser.parse_known_args(argv or [])
+    fparser = generate_argparse_for_method(target.plugins, usage_tmpl=USAGE_FORMAT_TMPL)
+    fargs, _ = fparser.parse_known_args()
 
     # Display in a user friendly manner
     if collected:
-        if as_json:
+        if json:
             print('{"plugins": ', end="")
             print(generate_functions_json(collected), end="")
         else:
@@ -276,17 +230,48 @@ def list_plugins(
 
     # No real targets specified, show the available loaders
     if not targets:
-        fparser = generate_argparse_for_bound_method(target.loaders, usage_tmpl=USAGE_FORMAT_TMPL)
-        fargs, rest = fparser.parse_known_args(rest)
-        del fargs.as_json
-        if as_json:
+        fparser = generate_argparse_for_method(target.loaders, usage_tmpl=USAGE_FORMAT_TMPL)
+        fargs, _ = fparser.parse_known_args()
+        if json:
             print(', "loaders": ', end="")
-        target.loaders(**vars(fargs), as_json=as_json)
+        target.loaders(**vars(fargs))
 
-    if as_json:
+    if json:
         print("}")
 
 
+def generate_argparse_for_method(
+    method: Callable,
+    usage_tmpl: str | None = None,
+) -> argparse.ArgumentParser:
+    """Generate an ``argparse.ArgumentParser`` for a bound or unbound ``Plugin`` class method."""
+
+    # allow functools.partial wrapped method
+    while hasattr(method, "func"):
+        method = method.func
+
+    if not inspect.isfunction(method) and not inspect.ismethod(method):
+        raise ValueError(f"Value `{method}` is not a plugin method")
+
+    desc = method.__doc__ or docs.get_func_description(method, with_docstrings=True)
+
+    if "\n" in desc:
+        desc = inspect.cleandoc(desc)
+
+    help_formatter = argparse.RawDescriptionHelpFormatter
+    parser = argparse.ArgumentParser(description=desc, formatter_class=help_formatter, conflict_handler="resolve")
+
+    _add_args_to_parser(parser, getattr(method, "__args__", []))
+
+    usage = parser.format_usage()
+    offset = usage.find(parser.prog) + len(parser.prog)
+    func_name = method.__name__
+    usage_tmpl = usage_tmpl or "{prog} {usage}"
+    parser.usage = usage_tmpl.format(prog=parser.prog, name=func_name, usage=usage[offset:])
+
+    return parser
+
+
 def generate_argparse_for_plugin_class(
     plugin_cls: type[Plugin],
     usage_tmpl: str | None = None,
@@ -313,6 +298,21 @@ def generate_argparse_for_plugin_class(
     return parser
 
 
+def generate_argparse_for_plugin(
+    plugin_instance: Plugin,
+    usage_tmpl: str | None = None,
+) -> argparse.ArgumentParser:
+    """Generate an ``argparse.ArgumentParser`` for a ``Plugin`` instance."""
+
+    if not isinstance(plugin_instance, Plugin):
+        raise TypeError(f"`plugin_instance` must be a valid plugin instance, not `{plugin_instance}`")
+
+    if not hasattr(plugin_instance, "__namespace__"):
+        raise ValueError(f"Plugin `{plugin_instance}` is not a namespace plugin and is not callable")
+
+    return generate_argparse_for_plugin_class(plugin_instance.__class__, usage_tmpl=usage_tmpl)
+
+
 def _add_args_to_parser(
     parser: argparse.ArgumentParser,
     fargs: list[tuple[list[str], dict[str, Any]]],
@@ -334,35 +334,21 @@ def _add_args_to_parser(
             parser.add_argument(*args, **kwargs)
 
 
-def generate_argparse_for_plugin(
-    plugin_instance: Plugin,
-    usage_tmpl: str | None = None,
-) -> argparse.ArgumentParser:
-    """Generate an ``argparse.ArgumentParser`` for a ``Plugin`` instance."""
-
-    if not isinstance(plugin_instance, Plugin):
-        raise TypeError(f"`plugin_instance` must be a valid plugin instance, not `{plugin_instance}`")
-
-    if not hasattr(plugin_instance, "__namespace__"):
-        raise ValueError(f"Plugin `{plugin_instance}` is not a namespace plugin and is not callable")
-
-    return generate_argparse_for_plugin_class(plugin_instance.__class__, usage_tmpl=usage_tmpl)
-
-
 def execute_function_on_target(
     target: Target,
     func: FunctionDescriptor,
-    arguments: list[str] | None = None,
+    args: list[str] | None = None,
 ) -> tuple[str, Any]:
-    """Execute function on provided target with provided arguments."""
+    """Execute function on provided target with optional provided arguments.
 
-    arguments = arguments or []
+    If no explicit arguments are provided, they will be parsed from ``sys.argv``.
+    """
 
     func_cls, func_obj = target.get_function(func.name)
     plugin_method, parser = plugin_function_with_argparser(func_obj)
 
     if parser:
-        known_args, _ = parser.parse_known_args(arguments)
+        known_args, _ = parser.parse_known_args(args)
         value = plugin_method(**vars(known_args))
     elif isinstance(func_obj, property):
         value = func_obj.__get__(func_cls)
@@ -391,7 +377,7 @@ def plugin_function_with_argparser(
         parser = generate_argparse_for_plugin(plugin_obj)
     elif callable(target_attr):
         plugin_method = target_attr
-        parser = generate_argparse_for_bound_method(target_attr)
+        parser = generate_argparse_for_method(target_attr)
     return plugin_method, parser
 
 
@@ -399,7 +385,7 @@ def persist_execution_report(output_dir: Path, report_data: dict, timestamp: dat
     timestamp = timestamp.strftime("%Y-%m-%d-%H%M%S")
     report_filename = f"target-report-{timestamp}.json"
     report_full_path = output_dir / report_filename
-    report_full_path.write_text(json.dumps(report_data, sort_keys=True, indent=4))
+    report_full_path.write_text(jsonlib.dumps(report_data, sort_keys=True, indent=4))
     return report_full_path
 
 
@@ -425,7 +411,7 @@ def catch_sigpipe(func: Callable) -> Callable:
     return wrapper
 
 
-def args_to_uri(targets: list[str], loader_name: str, rest: list[str]) -> list[str]:
+def args_to_uri(targets: list[str], loader_name: str, args: list[str] | None = None) -> list[str]:
     """Converts argument-style ``-L`` to URI-style.
 
     Turns:
@@ -442,7 +428,7 @@ def args_to_uri(targets: list[str], loader_name: str, rest: list[str]) -> list[s
     )
     for load_arg in getattr(loader, "__args__", []):
         parser.add_argument(*load_arg[0], **load_arg[1])
-    args = vars(parser.parse_known_args(rest)[0])
+    args = vars(parser.parse_known_args(args)[0])
     return [f"{loader_name}://{target}" + (("?" + urllib.parse.urlencode(args)) if args else "") for target in targets]
 
 

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect/target/tools/yara.py

@@ -35,8 +35,8 @@ def main() -> int:
 
     configure_generic_arguments(parser)
 
-    args, rest = parser.parse_known_args()
-    process_generic_arguments(args, rest)
+    args, _ = parser.parse_known_args()
+    process_generic_arguments(args)
 
     if not HAS_YARA:
         log.error("yara-python is not installed: pip install yara-python")

{dissect_target-3.23.dev60 → dissect_target-3.23.dev61}/dissect.target.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev60
+Version: 3.23.dev61
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3