From d71fd6264d58795c50b9350d7c39677b671e0896 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 17 Jul 2021 09:34:48 +0200 Subject: Merging upstream version 1.9.4. Signed-off-by: Daniel Baumann --- iredis/utils.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'iredis/utils.py') diff --git a/iredis/utils.py b/iredis/utils.py index b11097d..b64f874 100644 --- a/iredis/utils.py +++ b/iredis/utils.py @@ -40,7 +40,7 @@ def literal_bytes(b): return b -def _valide_token(words): +def _valid_token(words): token = "".join(words).strip() if token: yield token @@ -104,7 +104,10 @@ def parse_argument_to_formatted_text( result = [] if isinstance(name, str): _type = type_convert.get(_type, _type) - result.append((f"class:{style_class}.{_type}", " " + name)) + if is_option: + result.append((f"class:{style_class}.{_type}", f" [{name}]")) + else: + result.append((f"class:{style_class}.{_type}", f" {name}")) elif isinstance(name, list): for inner_name, inner_type in zip(name, _type): inner_type = type_convert.get(inner_type, inner_type) @@ -190,7 +193,7 @@ def _literal_bytes(b): backslash. "hello\" -> \"hello\\\" - we don't add outter double quotes here, since + we don't add outer double quotes here, since completer also need this function's return value to patch completers. @@ -233,14 +236,14 @@ def double_quotes(unquoted): """ Display String like redis-cli. escape inner double quotes. - add outter double quotes. + add outer double quotes. :param unquoted: list, or str """ if isinstance(unquoted, str): # escape double quote escaped = unquoted.replace('"', '\\"') - return f'"{escaped}"' # add outter double quotes + return f'"{escaped}"' # add outer double quotes elif isinstance(unquoted, list): return [double_quotes(item) for item in unquoted] -- cgit v1.2.3