1
0
Fork 0

Fix scripts so they can work with python3 (#10276)

This commit is contained in:
Jan Christoph Uhde 2019-11-18 10:33:34 +01:00 committed by Jan
parent ebf3296e9c
commit f58c1f8abb
2 changed files with 56 additions and 52 deletions

View File

@ -1,4 +1,5 @@
#!/usr/bin/python
#!/usr/bin/env python3
from __future__ import print_function
import csv, sys, os.path, re
# wrap text after x characters
@ -121,13 +122,17 @@ prologue = "/// auto-generated file generated from errors.dat\n"\
+ "\n"
if len(sys.argv) < 3:
print >> sys.stderr, "usage: %s <sourcefile> <outfile>" % sys.argv[0]
sys.exit()
print("usage: {} <sourcefile> <outfile>".format(sys.argv[0]), file=sys.stderr)
sys.exit(1)
source = sys.argv[1]
# read input file
errors = csv.reader(open(source, "rb"))
erros = []
with open(source) as source_fh:
errors = csv.reader(open(source, "r"))
errorsList = []
r1 = re.compile(r'^#.*')
@ -140,7 +145,7 @@ for e in errors:
continue
if e[0] == "" or e[1] == "" or e[2] == "" or e[3] == "":
print >> sys.stderr, "invalid error declaration file: %s" % (source)
print("invalid error declaration file: {}".format(source), file=sys.stderr)
sys.exit()
errorsList.append(e)
@ -160,10 +165,8 @@ elif extension == ".h":
elif extension == ".cpp":
out = genCFile(errorsList, filename)
else:
print >> sys.stderr, "usage: %s <sourcefile> <outfile>" % sys.argv[0]
sys.exit()
outFile = open(outfile, "wb")
outFile.write(out)
outFile.close()
print("usage: {} <sourcefile> <outfile>".format(sys.argv[0]), file=sys.stderr)
sys.exit(1)
with open(outfile, "w") as out_fh:
out_fh.write(out)

View File

@ -1,4 +1,5 @@
#!/usr/bin/python
#!/usr/bin/env python3
from __future__ import print_function
import csv, sys, os.path, re
# wrap text after x characters
@ -169,14 +170,16 @@ prologue = "/// auto-generated file generated from exitcodes.dat\n"\
+ "\n"
if len(sys.argv) < 3:
print >> sys.stderr, "usage: %s <sourcefile> <outfile>" % sys.argv[0]
sys.exit()
print("usage: {} <sourcefile> <outfile>".format(sys.argv[0]), file=sys.stderr)
sys.exit(1)
source = sys.argv[1]
# read input file
errors = csv.reader(open(source, "rb"))
errors=None
errorsList = []
with open(source, "r") as source_fh:
errors = csv.reader(source_fh)
r1 = re.compile(r'^#.*')
@ -188,8 +191,8 @@ for e in errors:
continue
if e[0] == "" or e[1] == "" or e[2] == "" or e[3] == "":
print >> sys.stderr, "invalid exit code declaration file: %s" % (source)
sys.exit()
print("invalid exit code declaration file: {}".format(source), file=sys.stderr)
sys.exit(1)
errorsList.append(e)
@ -210,10 +213,8 @@ elif extension == ".cpp":
elif extension == ".nsh":
out = genNSISFile(errorsList, filename)
else:
print >> sys.stderr, "usage: %s <sourcefile> <outfile>" % sys.argv[0]
sys.exit()
outFile = open(outfile, "wb")
outFile.write(out);
outFile.close()
print("usage: {} <sourcefile> <outfile>".format(sys.argv[0]), file=sys.stderr)
sys.exit(1)
with open(outfile, "w") as out_fh:
out_fh.write(out);