Mercurial > hg > gcmultimerge
changeset 47:a8fdecd4be61
Fixes to Unicode handling.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 05 Jul 2016 17:55:14 +0300 |
parents | 51c87abe5a1e |
children | 1ce5ccd949b6 |
files | multimerge.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/multimerge.py Tue Jul 05 16:45:35 2016 +0300 +++ b/multimerge.py Tue Jul 05 17:55:14 2016 +0300 @@ -36,7 +36,7 @@ ## because of piped output not having a defined encoding. We default ## to UTF-8 encoding in output here. def gcm_print(smsg): - gcm_msgbuf.append(smsg.encode("UTF-8")) + gcm_msgbuf.append(smsg) if sys.stdout.encoding != None: print(smsg.encode(sys.stdout.encoding)) else: @@ -67,7 +67,7 @@ if cfg.debug: gcm_print(u"DBG: "+ smsg) else: - gcm_msgbuf.append(u"DBG: "+ smsg.encode("UTF-8")) + gcm_msgbuf.append(u"DBG: {0}".format(smsg)) ## Handler for SIGINT signals