Mirrored_Repos/python-kasa
1
0
Fork 0
mirror of https://github.com/python-kasa/python-kasa.git synced 2024-12-22 19:23:34 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix overly greedy _strip_rich_formatting (#703)

Browse Source
This commit is contained in:
J. Nick Koston 2024-01-24 11:53:28 -10:00 committed by GitHub
parent 3df837cc82
commit ae6a31463e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kasa/cli.py
View File

@ -37,6 +37,9 @@ except ImportError:
try: try:
from rich import print as _do_echo from rich import print as _do_echo
except ImportError: except ImportError:
# Remove 7-bit C1 ANSI sequences
# https://stackoverflow.com/questions/14693701/how-can-i-remove-the-ansi-escape-sequences-from-a-string-in-python
ansi_escape = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
def _strip_rich_formatting(echo_func): def _strip_rich_formatting(echo_func):
"""Strip rich formatting from messages.""" """Strip rich formatting from messages."""
@ -44,7 +47,7 @@ except ImportError:
@wraps(echo_func) @wraps(echo_func)
def wrapper(message=None, *args, **kwargs): def wrapper(message=None, *args, **kwargs):
if message is not None: if message is not None:
message = re.sub(r"\[/?.+?]", "", message) message = ansi_escape.sub("", message)
echo_func(message, *args, **kwargs) echo_func(message, *args, **kwargs)
return wrapper return wrapper