kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[tools] fix fcinfo -g script [skip-ci]

Browse Source 
ZipFile.read returns a bytes-like object so re.sub must be passed byte-like objects arguments when operating on those read files.
This commit is contained in:
Adrian Insaurralde Avalos
2022-09-13 19:34:43 -04:00
parent 3c3e2f63e6
commit 8269fdbe70
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Tools/fcinfo
View File

@@ -235,11 +235,11 @@ if __name__ == '__main__':
doc = zfile.read("Document.xml")
if gui and "GuiDocument.xml" in zfile.namelist():
guidoc = zfile.read("GuiDocument.xml")
guidoc = re.sub(r"<\?xml.*?-->"," ",guidoc,flags=re.MULTILINE|re.DOTALL)
guidoc = re.sub(b"<\?xml.*?-->",b" ",guidoc,flags=re.MULTILINE|re.DOTALL)
# a valid xml doc can have only one root element. So we need to insert
# all the contents of the GUiDocument <document> tag into the main one
doc = re.sub(r"<\/Document>","",doc,flags=re.MULTILINE|re.DOTALL)
guidoc = re.sub(r"<Document.*?>"," ",guidoc,flags=re.MULTILINE|re.DOTALL)
doc = re.sub(b"<\/Document>",b"",doc,flags=re.MULTILINE|re.DOTALL)
guidoc = re.sub(b"<Document.*?>",b" ",guidoc,flags=re.MULTILINE|re.DOTALL)
doc += guidoc
s = os.path.getsize(sys.argv[-1])
if s < 1024: