aboutsummaryrefslogtreecommitdiffhomepage
path: root/libs/rich/prompt.py
diff options
context:
space:
mode:
Diffstat (limited to 'libs/rich/prompt.py')
-rw-r--r--libs/rich/prompt.py36
1 files changed, 17 insertions, 19 deletions
diff --git a/libs/rich/prompt.py b/libs/rich/prompt.py
index 7db5d2db7..c56071887 100644
--- a/libs/rich/prompt.py
+++ b/libs/rich/prompt.py
@@ -54,9 +54,9 @@ class PromptBase(Generic[PromptType]):
self,
prompt: TextType = "",
*,
- console: Console = None,
+ console: Optional[Console] = None,
password: bool = False,
- choices: List[str] = None,
+ choices: Optional[List[str]] = None,
show_default: bool = True,
show_choices: bool = True,
) -> None:
@@ -78,13 +78,13 @@ class PromptBase(Generic[PromptType]):
cls,
prompt: TextType = "",
*,
- console: Console = None,
+ console: Optional[Console] = None,
password: bool = False,
- choices: List[str] = None,
+ choices: Optional[List[str]] = None,
show_default: bool = True,
show_choices: bool = True,
default: DefaultType,
- stream: TextIO = None,
+ stream: Optional[TextIO] = None,
) -> Union[DefaultType, PromptType]:
...
@@ -94,12 +94,12 @@ class PromptBase(Generic[PromptType]):
cls,
prompt: TextType = "",
*,
- console: Console = None,
+ console: Optional[Console] = None,
password: bool = False,
- choices: List[str] = None,
+ choices: Optional[List[str]] = None,
show_default: bool = True,
show_choices: bool = True,
- stream: TextIO = None,
+ stream: Optional[TextIO] = None,
) -> PromptType:
...
@@ -108,13 +108,13 @@ class PromptBase(Generic[PromptType]):
cls,
prompt: TextType = "",
*,
- console: Console = None,
+ console: Optional[Console] = None,
password: bool = False,
- choices: List[str] = None,
+ choices: Optional[List[str]] = None,
show_default: bool = True,
show_choices: bool = True,
default: Any = ...,
- stream: TextIO = None,
+ stream: Optional[TextIO] = None,
) -> Any:
"""Shortcut to construct and run a prompt loop and return the result.
@@ -188,7 +188,7 @@ class PromptBase(Generic[PromptType]):
console: Console,
prompt: TextType,
password: bool,
- stream: TextIO = None,
+ stream: Optional[TextIO] = None,
) -> str:
"""Get input from user.
@@ -235,7 +235,7 @@ class PromptBase(Generic[PromptType]):
if self.choices is not None and not self.check_choice(value):
raise InvalidResponse(self.illegal_choice_message)
- return return_value
+ return return_value # type: ignore
def on_validate_error(self, value: str, error: InvalidResponse) -> None:
"""Called to handle validation error.
@@ -250,16 +250,16 @@ class PromptBase(Generic[PromptType]):
"""Hook to display something before the prompt."""
@overload
- def __call__(self, *, stream: TextIO = None) -> PromptType:
+ def __call__(self, *, stream: Optional[TextIO] = None) -> PromptType:
...
@overload
def __call__(
- self, *, default: DefaultType, stream: TextIO = None
+ self, *, default: DefaultType, stream: Optional[TextIO] = None
) -> Union[PromptType, DefaultType]:
...
- def __call__(self, *, default: Any = ..., stream: TextIO = None) -> Any:
+ def __call__(self, *, default: Any = ..., stream: Optional[TextIO] = None) -> Any:
"""Run the prompt loop.
Args:
@@ -330,11 +330,10 @@ class Confirm(PromptBase[bool]):
response_type = bool
validate_error_message = "[prompt.invalid]Please enter Y or N"
- choices = ["y", "n"]
+ choices: List[str] = ["y", "n"]
def render_default(self, default: DefaultType) -> Text:
"""Render the default as (y) or (n) rather than True/False."""
- assert self.choices is not None
yes, no = self.choices
return Text(f"({yes})" if default else f"({no})", style="prompt.default")
@@ -343,7 +342,6 @@ class Confirm(PromptBase[bool]):
value = value.strip().lower()
if value not in self.choices:
raise InvalidResponse(self.validate_error_message)
- assert self.choices is not None
return value == self.choices[0]