AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-10-18 11:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: remove encoding parameter (#5710)

Browse Source 
Those scripts are running on Python2.7 if build with the NDK tools.
Under python2.7, io.open will load as "utf-8" since we give the encoding
option, and return a "unicode" string.
Under Python3, the open() function will return a UTF-8 string.
This means the XMLParser needs to have a different 'encoding' option
depending on the python version.

For some reason I don't know, the XMLParser still fails if we use
'unicode' under Python2.7. But converting the unicode string to utf-8
does work.

Signed-off-by: Nathan Gauër <brioche@google.com>
This commit is contained in:
Nathan Gauër 2024-06-17 16:08:55 +02:00 committed by GitHub
parent 7564e142d6
commit 6c8b460eb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/generate_registry_tables.py
View File

@ -17,6 +17,7 @@
import errno
import io
import os.path
import platform
from xml.etree.ElementTree import XML, XMLParser, TreeBuilder
@ -80,8 +81,15 @@ def main():
args = parser.parse_args()
with io.open(args.xml, encoding='utf-8') as xml_in:
# Python3 default str to UTF-8. But Python2.7 (in case of NDK build,
# don't be fooled by the shebang) is returning a unicode string.
# So depending of the version, we need to make sure the correct
# encoding is used.
content = xml_in.read()
if platform.python_version_tuple()[0] == '2':
content = content.encode('utf-8')
parser = XMLParser(target=TreeBuilder(), encoding='utf-8')
registry = XML(xml_in.read(), parser=parser)
registry = XML(content, parser=parser)
mkdir_p(os.path.dirname(args.generator_output))
with open(args.generator_output, 'w') as f: