[Mesa-dev] [PATCH] python: Help Python 2 print the line

Mathieu Bridon bochecha at daitauha.fr
Fri Aug 17 13:22:21 UTC 2018


---
Jose, can you test whether this patch fixes your build issues?

I don't have access to a Windows machine, and I can't reproduce your
problem on Linux.

 src/util/xmlpool/gen_xmlpool.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/util/xmlpool/gen_xmlpool.py b/src/util/xmlpool/gen_xmlpool.py
index 327709c7f8d..12177dc50f5 100644
--- a/src/util/xmlpool/gen_xmlpool.py
+++ b/src/util/xmlpool/gen_xmlpool.py
@@ -218,6 +218,11 @@ for line in template:
         assert len(descMatches) == 0
         descMatches = [matchDESC_BEGIN]
     else:
+        # In Python 2, stdout expects encoded byte strings, or else it will
+        # encode them with the ascii 'codec'
+        if sys.version_info.major == 2:
+            line = line.encode('utf-8')
+
         print(line, end='')
 
 template.close()
-- 
2.17.1



More information about the mesa-dev mailing list