espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/build_color_output_windows_v5.0' into 'release/v5.0'

Browse Source 
tools: idf.py: use actual sys.stdout instead of the memoized one (v5.0)

See merge request espressif/esp-idf!20112
This commit is contained in:
Jiang Jiang Jian
2022-09-14 13:53:41 +08:00
parent 89dc570faf 7c3de76692
commit 1944b4bdb3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/idf_py_actions/tools.py
View File

@@ -222,12 +222,12 @@ class RunTool:
if p.stderr and p.stdout: # it only to avoid None type in p.std if p.stderr and p.stdout: # it only to avoid None type in p.std
await asyncio.gather( await asyncio.gather(
self.read_and_write_stream(p.stderr, stderr_output_file, sys.stderr), self.read_and_write_stream(p.stderr, stderr_output_file, sys.stderr),
self.read_and_write_stream(p.stdout, stdout_output_file)) self.read_and_write_stream(p.stdout, stdout_output_file, sys.stdout))
await p.wait() # added for avoiding None returncode await p.wait() # added for avoiding None returncode
return p, stderr_output_file, stdout_output_file return p, stderr_output_file, stdout_output_file
async def read_and_write_stream(self, input_stream: asyncio.StreamReader, output_filename: str, async def read_and_write_stream(self, input_stream: asyncio.StreamReader, output_filename: str,
output_stream: TextIO=sys.stdout) -> None: output_stream: TextIO) -> None:
"""read the output of the `input_stream` and then write it into `output_filename` and `output_stream`""" """read the output of the `input_stream` and then write it into `output_filename` and `output_stream`"""
def delete_ansi_escape(text: str) -> str: def delete_ansi_escape(text: str) -> str:
ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])') ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')