From: Mathieu Bridon Date: Thu, 5 Jul 2018 13:17:46 +0000 (+0200) Subject: python: Specify the template output encoding X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba1ebf2ee12ef5cb97a450e7d39f577c671d55e4;p=mesa.git python: Specify the template output encoding We're trying to write a unicode string (i.e decoded) to a file opened in binary (i.e encoded) mode. In Python 2 this works, because of the automatic conversion between byte and unicode strings. In Python 3 this fails though, as no automatic conversion is attempted. This change makes the scripts compatible with both versions of Python. Signed-off-by: Mathieu Bridon Reviewed-by: Dylan Baker --- diff --git a/src/compiler/nir/nir_intrinsics_c.py b/src/compiler/nir/nir_intrinsics_c.py index 98af67c38ae..ac45b94d496 100644 --- a/src/compiler/nir/nir_intrinsics_c.py +++ b/src/compiler/nir/nir_intrinsics_c.py @@ -64,7 +64,7 @@ def main(): path = os.path.join(args.outdir, 'nir_intrinsics.c') with open(path, 'wb') as f: - f.write(Template(template).render(INTR_OPCODES=INTR_OPCODES)) + f.write(Template(template, output_encoding='utf-8').render(INTR_OPCODES=INTR_OPCODES)) if __name__ == '__main__': main() diff --git a/src/compiler/nir/nir_intrinsics_h.py b/src/compiler/nir/nir_intrinsics_h.py index 8a4f0d501e6..8abc6a8626d 100644 --- a/src/compiler/nir/nir_intrinsics_h.py +++ b/src/compiler/nir/nir_intrinsics_h.py @@ -53,7 +53,7 @@ def main(): path = os.path.join(args.outdir, 'nir_intrinsics.h') with open(path, 'wb') as f: - f.write(Template(template).render(INTR_OPCODES=INTR_OPCODES)) + f.write(Template(template, output_encoding='utf-8').render(INTR_OPCODES=INTR_OPCODES)) if __name__ == '__main__': main()