From 793c808797cf574eac6d1a2ea9d226752ac9fd19 Mon Sep 17 00:00:00 2001 From: MMGen Date: Wed, 31 Oct 2018 16:18:50 +0000 Subject: [PATCH] py3port: binary, text-mode file reads and writes --- mmgen/opts.py | 2 +- mmgen/util.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mmgen/opts.py b/mmgen/opts.py index 6f4a680d..74191a06 100755 --- a/mmgen/opts.py +++ b/mmgen/opts.py @@ -104,7 +104,7 @@ def get_cfg_template_data(): + (['share'],['local','share'])[g.platform=='linux'] + [g.proj_name.lower(),os.path.basename(g.cfg_file)])) try: - with open(cfg_template,'rb') as f: + with open(cfg_template,'r') as f: return f.read() except: msg("WARNING: configuration template not found at '{}'".format(cfg_template)) diff --git a/mmgen/util.py b/mmgen/util.py index 70fc9d61..f953b5be 100755 --- a/mmgen/util.py +++ b/mmgen/util.py @@ -678,7 +678,9 @@ def get_data_from_file(infile,desc='data',dash=False,silent=False,binary=False,r data = f.read() f.close() if require_utf8: - try: data = data.decode() + try: + if binary: data = data.decode() + else: data.encode() except: die(1,'{} data must be UTF-8 encoded.'.format(capfirst(desc))) return data