commit: 50c23c1fe4c8138074e713d6807b8f1b9caa212d
Author: Brian Harring <ferringb <AT> gmail <DOT> com>
AuthorDate: Sat Nov 22 19:01:24 2025 +0000
Commit: Brian Harring <ferringb <AT> gmail <DOT> com>
CommitDate: Sat Nov 22 19:01:24 2025 +0000
URL:
https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=50c23c1f
chore: annotate scripts bind_main_func
Signed-off-by: Brian Harring <ferringb <AT> gmail.com>
src/pkgcore/scripts/pclean.py | 9 +++++++--
src/pkgcore/scripts/pconfig.py | 37 +++++++++++++++++++++++++++++--------
src/pkgcore/scripts/pinspect.py | 5 +++--
src/pkgcore/scripts/pquery.py | 5 ++++-
4 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/src/pkgcore/scripts/pclean.py b/src/pkgcore/scripts/pclean.py
index 3ff66cc5..141d38b4 100644
--- a/src/pkgcore/scripts/pclean.py
+++ b/src/pkgcore/scripts/pclean.py
@@ -12,6 +12,7 @@ from collections import defaultdict
from functools import partial
from itertools import chain
+import snakeoil.formatters
from snakeoil.mappings import DictMixin
from snakeoil.osutils import listdir_dirs, listdir_files, pjoin
from snakeoil.sequences import iflatten_instance, split_negations
@@ -301,7 +302,7 @@ config = subparsers.add_parser(
@config.bind_main_func
-def config_main(options, out, err):
+def config_main(options, out: snakeoil.formatters.PlainTextFormatter, _err):
domain = options.domain
installed_repos = domain.all_installed_repos
all_repos_raw = domain.all_repos_raw
@@ -685,7 +686,11 @@ def _tmp_validate_args(parser, namespace):
@dist.bind_main_func
@pkg.bind_main_func
@tmp.bind_main_func
-def _remove(options, out, err):
+def _remove(
+ options,
+ out: snakeoil.formatters.PlainTextFormatter,
+ err: snakeoil.formatters.PlainTextFormatter,
+):
"""Generic removal runner."""
ret = 0
if sys.stdout.isatty():
diff --git a/src/pkgcore/scripts/pconfig.py b/src/pkgcore/scripts/pconfig.py
index 3895642e..647a1c96 100644
--- a/src/pkgcore/scripts/pconfig.py
+++ b/src/pkgcore/scripts/pconfig.py
@@ -4,6 +4,7 @@ import textwrap
import traceback
from functools import partial
+import snakeoil.formatters
from snakeoil.errors import dump_error
from snakeoil.python_namespaces import PythonNamespaceWalker
@@ -128,7 +129,11 @@ classes = subparsers.add_parser(
@classes.bind_main_func
-def classes_main(options, out, err):
+def classes_main(
+ options,
+ out: snakeoil.formatters.PlainTextFormatter,
+ _err: snakeoil.formatters.PlainTextFormatter,
+):
"""List all classes referenced by the config."""
configmanager = options.config
sections = []
@@ -157,7 +162,11 @@ describe_class.add_argument(
@describe_class.bind_main_func
-def describe_class_main(options, out, err):
+def describe_class_main(
+ options,
+ out: snakeoil.formatters.PlainTextFormatter,
+ err: snakeoil.formatters.PlainTextFormatter,
+):
"""Describe the arguments a class needs."""
try:
type_obj = basics.ConfigType(options.target_class)
@@ -194,7 +203,7 @@ uncollapsable = subparsers.add_parser(
@uncollapsable.bind_main_func
-def uncollapsable_main(options, out, err):
+def uncollapsable_main(options, out: snakeoil.formatters.PlainTextFormatter,
_err):
"""Show things that could not be collapsed."""
config = options.config
for name in sorted(config.sections()):
@@ -233,7 +242,7 @@ dump.add_argument(
@dump.bind_main_func
-def dump_main(options, out, err):
+def dump_main(options, out: snakeoil.formatters.PlainTextFormatter, _err):
"""Dump the entire configuration."""
config = options.config
if options.typename is None:
@@ -293,7 +302,7 @@ configurables.add_argument(
@configurables.bind_main_func
-def configurables_main(options, out, err):
+def configurables_main(options, out: snakeoil.formatters.PlainTextFormatter,
_err):
"""List registered configurables."""
# try and sort this beast.
@@ -366,7 +375,11 @@ dump_uncollapsed = subparsers.add_parser(
@dump_uncollapsed.bind_main_func
-def dump_uncollapsed_main(options, out, err):
+def dump_uncollapsed_main(
+ options,
+ out: snakeoil.formatters.PlainTextFormatter,
+ err: snakeoil.formatters.PlainTextFormatter,
+):
"""dump the configuration in a raw, uncollapsed form.
Not directly usable as a configuration file, mainly used for inspection
"""
@@ -410,7 +423,11 @@ commandline.make_query(
@package.bind_main_func
-def package_func(options, out, err):
+def package_func(
+ options,
+ out: snakeoil.formatters.PlainTextFormatter,
+ _err: snakeoil.formatters.PlainTextFormatter,
+):
matched = True
domain = options.domain
for pkg in domain.installed_repos.combined.itermatch(options.query):
@@ -468,7 +485,11 @@ world.set_defaults(
@world.bind_main_func
-def world_func(options, out, err):
+def world_func(
+ options,
+ out: snakeoil.formatters.PlainTextFormatter,
+ _err: snakeoil.formatters.PlainTextFormatter,
+):
world_file = options.world
if options.remove:
diff --git a/src/pkgcore/scripts/pinspect.py b/src/pkgcore/scripts/pinspect.py
index a3fae9bd..9a950756 100644
--- a/src/pkgcore/scripts/pinspect.py
+++ b/src/pkgcore/scripts/pinspect.py
@@ -19,6 +19,7 @@ from concurrent.futures import ThreadPoolExecutor
from itertools import groupby, islice
from operator import attrgetter, itemgetter
+import snakeoil.formatters
from snakeoil.cli import arghparse
from snakeoil.sequences import iflatten_instance, unstable_unique
@@ -54,7 +55,7 @@ del mux
@pkgsets.bind_main_func
-def pkgsets_run(opts, out, err):
+def pkgsets_run(opts, out: snakeoil.formatters.PlainTextFormatter, _err):
if not opts.pkgsets:
if not opts.all:
out.write(
@@ -427,7 +428,7 @@ digests.add_argument(
@digests.bind_main_func
-def digest_manifest(options, out, err):
+def digest_manifest(options, out: snakeoil.formatters.PlainTextFormatter,
_err):
for name, repo in options.repos:
count = 0
broken = []
diff --git a/src/pkgcore/scripts/pquery.py b/src/pkgcore/scripts/pquery.py
index 4dc65614..95c8e065 100644
--- a/src/pkgcore/scripts/pquery.py
+++ b/src/pkgcore/scripts/pquery.py
@@ -19,6 +19,7 @@ import sys
import typing
from functools import partial
+import snakeoil.formatters
from snakeoil.cli import arghparse
from snakeoil.formatters import decorate_forced_wrapping
from snakeoil.osutils import sizeof_fmt
@@ -1230,7 +1231,9 @@ def _validate_args(parser, namespace):
@argparser.bind_main_func
-def main(options, out, err):
+def main(
+ options, out: snakeoil.formatters.Formatter, err:
snakeoil.formatters.Formatter
+):
"""Run a query."""
if options.debug:
for repo in options.repos:
