summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvolkov-am <volkov.am@ekb-info.ru>2018-04-06 03:55:51 +0500
committerHisham Muhammad <hisham@gobolinux.org>2018-08-24 15:58:12 -0300
commit791aae87c4d5c67c175f4ee7a0989d20481c24d5 (patch)
treeb142ca6b661733fbdc6a76f0efd36422ea10091e
parent505fa6b5172e90a4c1ef41b0fe92d289f2c90d04 (diff)
MakeHeader.py: Fix for non-utf8 environments (#770)
Header creation fails with non-utf8 locale and python3. Simply set LC_ALL="C" and use python3 to reproduce the issue. env LC_ALL="C" ./scripts/MakeHeader.py MetersPanel.c Traceback (most recent call last): File "./scripts/MakeHeader.py", line 32, in <module> for line in file.readlines(): File "/usr/lib64/python3.5/encodings/ascii.py", line 26, in decode return codecs.ascii_decode(input, self.errors)[0] UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 956: ordinal not in range(128) This changes is python2 and python3 compatible cStringIO.StringIO module is removed because it is not able to accept unicode strings https://docs.python.org/2/library/stringio.html#cStringIO.StringIO
-rwxr-xr-xscripts/MakeHeader.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
index 2393afc2..5299d0ed 100755
--- a/scripts/MakeHeader.py
+++ b/scripts/MakeHeader.py
@@ -1,12 +1,9 @@
#!/usr/bin/env python
-import os, sys, string
+import os, sys, string, io
try:
- from cStringIO import StringIO
+ from StringIO import StringIO
except ImportError:
- try:
- from StringIO import StringIO
- except ImportError:
- from io import StringIO
+ from io import StringIO
ANY=1
COPY=2
@@ -17,7 +14,7 @@ COPYDEFINE=5
state = ANY
static = 0
-file = open(sys.argv[1])
+file = io.open(sys.argv[1], "r", encoding="utf-8")
name = sys.argv[1][:-2]
out = StringIO()
@@ -104,12 +101,12 @@ out.write( "#endif\n" )
# This prevents a lot of recompilation during development
out.seek(0)
try:
- with open(name + ".h", "r") as orig:
+ with io.open(name + ".h", "r", encoding="utf-8") as orig:
origcontents = orig.readlines()
except:
origcontents = ""
if origcontents != out.readlines():
- with open(name + ".h", "w") as new:
+ with io.open(name + ".h", "w", encoding="utf-8") as new:
print("Writing "+name+".h")
new.write(out.getvalue())
out.close()

© 2014-2024 Faster IT GmbH | imprint | privacy policy