From df568a576f7b44ac5a2b9b7222c7f39d9932f626 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Wed, 11 Apr 2018 01:26:28 +0200 Subject: Imported Upstream version 2.2.0 --- scripts/MakeHeader.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'scripts') diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py index 4841bda..7c48fdd 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 @@ -16,7 +13,7 @@ SKIPONE=4 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() @@ -94,12 +91,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() -- cgit v1.2.3