From 69182a04b223824b5da1aeca253c815a9affedbc Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Tue, 27 Dec 2022 11:20:05 +0100
Subject: [PATCH] Drop default from ask_user_yesno question
There is no default for ask_user_yesno() since an empty answer instead
just repeats the question. Drop the unnecessary parameter.
Change-Id: I207bccbcbd31f831765e74a20c503b695790c0f5
---
openstackclient/common/project_cleanup.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/openstackclient/common/project_cleanup.py b/openstackclient/common/project_cleanup.py
index f253635495..1479f1a458 100644
--- a/openstackclient/common/project_cleanup.py
+++ b/openstackclient/common/project_cleanup.py
@@ -28,16 +28,15 @@ from openstackclient.identity import common as identity_common
LOG = logging.getLogger(__name__)
-def ask_user_yesno(msg, default=True):
+def ask_user_yesno(msg):
"""Ask user Y/N question
:param str msg: question text
- :param bool default: default value
:return bool: User choice
"""
while True:
answer = getpass._raw_input(
- '{} [{}]: '.format(msg, 'y/N' if not default else 'Y/n'))
+ '{} [{}]: '.format(msg, 'y/n'))
if answer in ('y', 'Y', 'yes'):
return True
elif answer in ('n', 'N', 'no'):
@@ -129,8 +128,7 @@ class ProjectCleanup(command.Command):
return
confirm = ask_user_yesno(
- _("These resources will be deleted. Are you sure"),
- default=False)
+ _("These resources will be deleted. Are you sure"))
if confirm:
self.log.warning(_('Deleting resources'))