Merge 9aba4e7 into ba74374

LeonarddeR · web-flow · commit 19942e55207a · 2022-07-08T21:22:00.000+02:00
diff --git a/venvUtils/ensureVenv.py b/venvUtils/ensureVenv.py
@@ -19,15 +19,20 @@
 requirements_path: str = os.path.join(top_dir, "requirements.txt")
 venv_orig_requirements_path: str = os.path.join(venv_path, "_requirements.txt")
 venv_python_version_path: str = os.path.join(venv_path, "python_version")
+#: Whether this script is run interactively,
+#: i.e. whether user input is possible to answer questions.
+#: Value is True if interactive (i.e. stdout is attached to a terminal), False otherwise.
+isInteractive = hasattr(sys.stdout, "isatty") and sys.stdout.isatty()
 
 
-def askYesNoQuestion(message: str) -> bool:
+def askYesNoQuestion(message: str, default: bool = True) -> bool:
 	"""
 	Displays the given message to the user and accepts y or n as input.
 	Any other input causes the question to be asked again.
-	@returns: True for y and n for False.
+	If isInteractive is False, the default is always returned.
+	@returns: True for y and False for n.
 	"""
-	while True:
+	while isInteractive:
 		answer = input(
 			message + " [y/n]: "
 		)
@@ -37,6 +42,7 @@ def askYesNoQuestion(message: str) -> bool:
 			return True
 		else:
 			continue  # ask again
+	return default
 
 
 def fetchRequirementsSet(path: str) -> Set[str]:
