aboutsummaryrefslogtreecommitdiffstats
path: root/lib/_emerge/depgraph.py
diff options
context:
space:
mode:
authorBerin Aniesh <berinaniesh@gmail.com>2023-07-10 08:40:07 +0530
committerSam James <sam@gentoo.org>2023-07-11 06:00:43 +0100
commitf228252f4b4c3b33ff1e199f55bec9a6a104b80c (patch)
tree0863acdedbb3b5efe9d4bdb5046573268af67bfd /lib/_emerge/depgraph.py
parentdepgraph.py: fix "no ebuilds/binpkgs" message (diff)
downloadgentoo-portage-f228252f4b4c3b33ff1e199f55bec9a6a104b80c.tar.xz
gentoo-portage-f228252f4b4c3b33ff1e199f55bec9a6a104b80c.zip
depgraph.py: fix wrong type annotations
Fixes: 7e8a730b85b77f9495f4999ac173dc726777203f Bug: https://bugs.gentoo.org/910171 Signed-off-by: Berin Aniesh <berinaniesh@gmail.com> Closes: https://github.com/gentoo/portage/pull/1067 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'lib/_emerge/depgraph.py')
-rw-r--r--lib/_emerge/depgraph.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 1aeae625791a..72747d7bc5ef 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -101,7 +101,11 @@ from _emerge.resolver.circular_dependency import circular_dependency_handler
from _emerge.resolver.output import Display, format_unmatched_atom
# Type annotation imports
-from typing import Any, Optional, Dict, List, Tuple, Union
+from typing import Any, Optional, Dict, List, Tuple, Union, TYPE_CHECKING
+
+if TYPE_CHECKING:
+ import _emerge.stdout_spinner.stdout_spinner
+
# Exposes a depgraph interface to dep_check.
_dep_check_graph_interface = collections.namedtuple(
@@ -11409,7 +11413,7 @@ def _spinner_stop(spinner):
def backtrack_depgraph(
settings: portage.package.ebuild.config.config,
trees: portage._trees_dict,
- myopts: Dict[str, Any],
+ myopts: Dict[str, Union[str, int, bool]],
myparams: Dict[str, Union[int, str, bool]],
myaction: Optional[str],
myfiles: List[str],
@@ -11431,7 +11435,7 @@ def backtrack_depgraph(
def _backtrack_depgraph(
settings: portage.package.ebuild.config.config,
trees: portage._trees_dict,
- myopts: Dict[str, Any],
+ myopts: Dict[str, Union[str, int, bool]],
myparams: Dict[str, Union[int, str, bool]],
myaction: Optional[str],
myfiles: List[str],
@@ -11536,8 +11540,8 @@ def resume_depgraph(
settings: portage.package.ebuild.config.config,
trees: portage._trees_dict,
mtimedb: Any,
- myopts: Dict[str, str],
- myparams: Dict[str, Any],
+ myopts: Dict[str, Union[str, int, bool]],
+ myparams: Dict[str, Union[str, bool]],
spinner: "_emerge.stdout_spinner.stdout_spinner",
):
"""
@@ -11554,8 +11558,8 @@ def _resume_depgraph(
settings: portage.package.ebuild.config.config,
trees: portage._trees_dict,
mtimedb: Any,
- myopts: Dict[str, str],
- myparams: Dict[str, Any],
+ myopts: Dict[str, Union[str, int, bool]],
+ myparams: Dict[str, Union[str, bool]],
spinner: "_emerge.stdout_spinner.stdout_spinner",
):
"""