matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

tools/indent.py: fix encoded byte stream handling

Browse source 
Python subprocess communication now operates on bytes, not strings.

Signed-off-by: Andrew Cooks <acooks.at.bda@gmail.com>
This commit is contained in:
Andrew Cooks 2024-04-09 15:39:14 +10:00
parent 8cfa3b57e9
commit e443644fdd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/indent.py
View file

@ -34,13 +34,13 @@ def wrap_file(fn):
ci = subprocess.Popen( ci = subprocess.Popen(
["clang-format"], stdin=subprocess.PIPE, stdout=subprocess.PIPE ["clang-format"], stdin=subprocess.PIPE, stdout=subprocess.PIPE
) )
stdout, ign = ci.communicate(text) stdout, ign = ci.communicate(text.encode("utf-8"))
ci.wait() ci.wait()
if ci.returncode != 0: if ci.returncode != 0:
raise IOError("clang-format returned %d" % (ci.returncode)) raise IOError("clang-format returned %d" % (ci.returncode))
# remove the bits we inserted above # remove the bits we inserted above
final = clean_re.sub("", stdout) final = clean_re.sub("", stdout.decode("utf-8"))
tmpname = fn + ".indent" tmpname = fn + ".indent"
with open(tmpname, "w") as ofd: with open(tmpname, "w") as ofd: