Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

pmb.parse.arguments: Check for argcomplete in sys.modules instead (MR 2258)

Browse source 
Repurposing argcomplete as a boolean telling whether the module
argcomplete was found results in a variable with two distinct purposes
and types, which is bad practice and confuses Mypy. As such, don't
assign False to argcomplete if the module is not found and instead just
check for whether it exists in sys.modules to determine whether it was
imported successfully.
This commit is contained in:
Newbyte 2024-02-14 18:03:18 +01:00
parent aa594b76fa
commit 3aad061c68
No known key found for this signature in database
GPG key ID: 8A700086A9FE41FD
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pmb/parse/arguments.py
View file

@ -3,11 +3,12 @@
import argparse
import copy
import os
import sys
try:
import argcomplete
except ImportError:
argcomplete = False
pass
import pmb.config
import pmb.parse.arch
@ -520,7 +521,7 @@ def arguments_repo_missing(subparser):
ret = subparser.add_parser("repo_missing")
package = ret.add_argument("package", nargs="?", help="only look at a"
" specific package and its dependencies")
if argcomplete:
if "argcomplete" in sys.modules:
package.completer = package_completer
ret.add_argument("--arch", choices=pmb.config.build_device_architectures,
default=pmb.config.arch_native)
@ -603,14 +604,14 @@ def kernel_completer(prefix, action, parser=None, parsed_args=None):
def add_packages_arg(subparser, name="packages", *args, **kwargs):
arg = subparser.add_argument(name, *args, **kwargs)
if argcomplete:
if "argcomplete" in sys.modules:
arg.completer = package_completer
def add_kernel_arg(subparser, name="package", nargs="?", *args, **kwargs):
arg = subparser.add_argument("package", nargs=nargs, help="kernel package"
" (e.g. linux-postmarketos-allwinner)")
if argcomplete:
if "argcomplete" in sys.modules:
arg.completer = kernel_completer
@ -910,7 +911,7 @@ def arguments():
sub.add_parser("pull", help="update all git repositories that pmbootstrap"
" cloned (pmaports, etc.)")
if argcomplete:
if "argcomplete" in sys.modules:
argcomplete.autocomplete(parser, always_complete_options="long")
# Parse and extend arguments (also backup unmodified result from argparse)