moonq/q-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

encoding fixes to fimplate

Browse Source
This commit is contained in:
Ville Rantanen
2020-11-16 09:48:30 +02:00
parent 5d3d2e3b11
commit e73d763387
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
files/fimplate.py
View File

@@ -87,7 +87,7 @@ if __name__ == "__main__":
if options.template == None: if options.template == None:
in_reader = sys.stdin in_reader = sys.stdin
else: else:
in_reader = open(options.template, "rb") in_reader = open(options.template, "rt")
for l in in_reader: for l in in_reader:
for p in pairs: for p in pairs:
value = p[1] value = p[1]
@@ -96,9 +96,9 @@ if __name__ == "__main__":
value = open(value[1:], "rt").read() value = open(value[1:], "rt").read()
elif value[0:2] == "\\@": elif value[0:2] == "\\@":
value = value[1:] value = value[1:]
l = l.replace(p[0].encode("utf-8"), value.encode("utf-8")) l = l.replace(p[0], value)
if options.env: if options.env:
var_list = [m.group(0) for m in re.finditer("\${[^ ]+}", l)] var_list = [m.group(0) for m in re.finditer("\${[^ ]+}", l)]
for v in var_list: for v in var_list:
l = l.replace(v, os.environ.get(v[:-1][2:], "")) l = l.replace(v, os.environ.get(v[:-1][2:], ""))
sys.stdout.write(l.decode("utf-8")) sys.stdout.write(l)