jenkins-bot has submitted this change and it was merged.

Change subject: [bugfix] re-enable 'Quit' option for BaseBot.user_confirm method. ......................................................................

[bugfix] re-enable 'Quit' option for BaseBot.user_confirm method.

'Quit' option was lost in I3d4ea6461 but still needed. This patch re-enables this option, discarding automatic_quit and call the corresponding regular BaseBot.quit method instead of raising an exception which could crop out elsewhere.

Bug: T126154 Change-Id: I0cbc61eb23194a29a5a1e85864ceb0d48305e20b --- M pywikibot/bot.py 1 file changed, 4 insertions(+), 2 deletions(-)

Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 18436db..eed8f6e 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1222,8 +1222,10 @@ choice = pywikibot.input_choice(question, [('Yes', 'y'), ('No', 'N'), - ('All', 'a')], - default='N') + ('All', 'a'), + ('Quit', 'q')], + default='N', + automatic_quit=False)

if choice == 'n': return False