From 9c2d66bfa3fc429afc8fff391607d9754136d332 Mon Sep 17 00:00:00 2001 From: mdrichardson Date: Mon, 28 Oct 2019 15:27:31 -0700 Subject: [PATCH 1/2] fix ChoicePrompt none style when set via options --- .../botbuilder/dialogs/prompts/choice_prompt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py index fdcd77bbc..fd6b3bcbd 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py @@ -121,7 +121,7 @@ async def on_prompt( if self.choice_options else ChoicePrompt._default_choice_options[culture] ) - choice_style = options.style if options.style else self.style + choice_style = 0 if options.style == 0 else options.style if options.style else self.style if is_retry and options.retry_prompt is not None: prompt = self.append_choices( From d22885c9558eb79d313cc982e71fa56d5e0e9232 Mon Sep 17 00:00:00 2001 From: mdrichardson Date: Tue, 29 Oct 2019 11:19:45 -0700 Subject: [PATCH 2/2] black compat --- .../botbuilder/dialogs/prompts/choice_prompt.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py index fd6b3bcbd..3332f3994 100644 --- a/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py +++ b/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/choice_prompt.py @@ -121,7 +121,9 @@ async def on_prompt( if self.choice_options else ChoicePrompt._default_choice_options[culture] ) - choice_style = 0 if options.style == 0 else options.style if options.style else self.style + choice_style = ( + 0 if options.style == 0 else options.style if options.style else self.style + ) if is_retry and options.retry_prompt is not None: prompt = self.append_choices(