Move query_yes_no implementation to utils.py

This is needed in order to avoid cyclic imports, and it removes a
runtime import from DeprecatedTargetAlias.

Author: arichardson

Diff for: pycheribuild/config/chericonfig.py

@@ -220,7 +220,8 @@ def __init__(self, loader, action_class):
         # Work around circular dependencies
         from .loader import ConfigLoaderBase
         # noinspection PyTypeChecker
-        super().__init__(pretend=DoNotUseInIfStmt(), verbose=DoNotUseInIfStmt(), quiet=DoNotUseInIfStmt())
+        super().__init__(pretend=DoNotUseInIfStmt(), verbose=DoNotUseInIfStmt(), quiet=DoNotUseInIfStmt(),
+                         force=DoNotUseInIfStmt())
         self._cached_deps = collections.defaultdict(dict)
 
         assert isinstance(loader, ConfigLoaderBase)

Diff for: pycheribuild/projects/project.py

@@ -57,7 +57,7 @@
 from ..targets import MultiArchTarget, MultiArchTargetAlias, Target, target_manager
 from ..utils import (AnsiColour, cached_property, classproperty, coloured, fatal_error, include_local_file,
                      InstallInstructions, is_jenkins_build, OSInfo, remove_prefix, replace_one, status_update,
-                     ThreadJoiner, remove_duplicates)
+                     ThreadJoiner, remove_duplicates, query_yes_no)
 
 __all__ = ["Project", "CMakeProject", "AutotoolsProject", "TargetAlias", "TargetAliasWithDependencies",  # no-combine
            "SimpleProject", "CheriConfig", "flush_stdio", "MakeOptions", "MakeCommandKind",  # no-combine
@@ -809,29 +809,10 @@ def add_required_system_header(self, header: str, install_instructions: str = No
                                                        apt=apt, homebrew=homebrew, cheribuild_target=cheribuild_target)
         self.__required_system_headers[header] = instructions
 
-    @staticmethod
-    def _query_yes_no(config: CheriConfig, message: str = "", *, default_result=False, force_result=True,
-                      yes_no_str: str = None) -> bool:
-        if yes_no_str is None:
-            yes_no_str = " [Y]/n " if default_result else " y/[N] "
-        if config.pretend:
-            print(message + yes_no_str, coloured(AnsiColour.green, "y" if force_result else "n"), sep="", flush=True)
-            return force_result  # in pretend mode we always return true
-        if config.force:
-            # in force mode we always return the forced result without prompting the user
-            print(message + yes_no_str, coloured(AnsiColour.green, "y" if force_result else "n"), sep="", flush=True)
-            return force_result
-        if not sys.__stdin__.isatty():
-            return default_result  # can't get any input -> return the default
-        result = input(message + yes_no_str)
-        if default_result:
-            return not result.startswith("n")  # if default is yes accept anything other than strings starting with "n"
-        return str(result).lower().startswith("y")  # anything but y will be treated as false
-
     def query_yes_no(self, message: str = "", *, default_result=False, force_result=True,
                      yes_no_str: str = None) -> bool:
-        return self._query_yes_no(self.config, message, default_result=default_result, force_result=force_result,
-                                  yes_no_str=yes_no_str)
+        return query_yes_no(self.config, message, default_result=default_result, force_result=force_result,
+                            yes_no_str=yes_no_str)
 
     def ask_for_confirmation(self, message: str, error_message="Cannot continue.", default_result=True, **kwargs):
         if not self.query_yes_no(message, default_result=default_result, **kwargs):

Diff for: pycheribuild/targets.py

@@ -36,7 +36,7 @@
 from .config.chericonfig import CheriConfig
 from .config.target_info import CrossCompileTarget
 from .processutils import set_env
-from .utils import add_error_context, AnsiColour, coloured, fatal_error, status_update, warning_message
+from .utils import add_error_context, AnsiColour, coloured, fatal_error, status_update, warning_message, query_yes_no
 
 if typing.TYPE_CHECKING:  # no-combine
     from .projects.project import SimpleProject  # no-combine
@@ -327,9 +327,7 @@ def get_real_target(self, cross_target: typing.Optional[CrossCompileTarget], con
                         coloured(AnsiColour.magenta, ". Please use "),
                         coloured(AnsiColour.yellow, self.real_target_name),
                         coloured(AnsiColour.magenta, " instead."), sep="")
-        from .projects.project import SimpleProject
-        # noinspection PyProtectedMember
-        if not SimpleProject._query_yes_no(config, "Continue?", default_result=True):
+        if not query_yes_no(config, "Continue?", default_result=True):
             fatal_error("Cannot continue.")
         return self._real_target
 

Diff for: pycheribuild/utils.py

@@ -45,7 +45,7 @@
 
 # reduce the number of import statements per project  # no-combine
 __all__ = ["typing", "include_local_file", "Type_T", "init_global_config",  # no-combine
-           "status_update", "fatal_error", "coloured", "AnsiColour",  # no-combine
+           "status_update", "fatal_error", "coloured", "AnsiColour", "query_yes_no",  # no-combine
            "warning_message", "DoNotUseInIfStmt", "ThreadJoiner", "InstallInstructions",  # no-combine
            "SafeDict", "error_message", "ConfigBase", "final", "add_error_context",  # no-combine
            "default_make_jobs_count", "OSInfo", "is_jenkins_build", "get_global_config",  # no-combine
@@ -88,16 +88,18 @@ def __len__(self):
 class ConfigBase:
     TEST_MODE = False
 
-    def __init__(self, *, pretend: bool, verbose: bool, quiet: bool):
+    def __init__(self, *, pretend: bool, verbose: bool, quiet: bool, force: bool):
         self.quiet = quiet
         self.verbose = verbose
         self.pretend = pretend
+        self.force = force
         self.internet_connection_last_checked_at = None  # type: typing.Optional[float]
         self.internet_connection_last_check_result = False
 
 
 # noinspection PyTypeChecker
-GlobalConfig = ConfigBase(pretend=DoNotUseInIfStmt(), verbose=DoNotUseInIfStmt(), quiet=DoNotUseInIfStmt())
+GlobalConfig = ConfigBase(pretend=DoNotUseInIfStmt(), verbose=DoNotUseInIfStmt(), quiet=DoNotUseInIfStmt(),
+                          force=DoNotUseInIfStmt())
 
 
 def init_global_config(config: ConfigBase, *, test_mode: bool = False):
@@ -266,6 +268,25 @@ def fatal_error(*args, sep=" ", fixit_hint=None, fatal_when_pretending=False, ex
         sys.exit(exit_code)
 
 
+def query_yes_no(config: ConfigBase, message: str = "", *, default_result=False, force_result=True,
+                 yes_no_str: str = None) -> bool:
+    if yes_no_str is None:
+        yes_no_str = " [Y]/n " if default_result else " y/[N] "
+    if config.pretend:
+        print(message + yes_no_str, coloured(AnsiColour.green, "y" if force_result else "n"), sep="", flush=True)
+        return force_result  # in pretend mode we always return true
+    if config.force:
+        # in force mode we always return the forced result without prompting the user
+        print(message + yes_no_str, coloured(AnsiColour.green, "y" if force_result else "n"), sep="", flush=True)
+        return force_result
+    if not sys.__stdin__.isatty():
+        return default_result  # can't get any input -> return the default
+    result = input(message + yes_no_str)
+    if default_result:
+        return not result.startswith("n")  # if default is yes accept anything other than strings starting with "n"
+    return str(result).lower().startswith("y")  # anything but y will be treated as false
+
+
 @functools.lru_cache(maxsize=20)
 def include_local_file(path: str) -> str:
     file = Path(__file__).parent / path  # type: Path

Diff for: vcu118-run.py

@@ -416,7 +416,7 @@ def main():
         pass
     args = parser.parse_args()
     print(args)
-    init_global_config(ConfigBase(pretend=args.pretend, verbose=True, quiet=False))
+    init_global_config(ConfigBase(pretend=args.pretend, verbose=True, quiet=False, force=False))
     if (args.action == "all" and args.bitfile is not None) or args.action == "bitfile":
         if args.ltxfile is None:
             args.ltxfile = Path(args.bitfile).with_suffix(".ltx")