From e2ad14ee1beadfd5223185df0a250934e1d359ad Mon Sep 17 00:00:00 2001 From: Sei Lisa Date: Sun, 25 Dec 2016 20:49:56 +0100 Subject: [PATCH] Fix a few violations of our guidelines for Unicode handling. Also use e.args[0] instead of e[0]. --- main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index 472bba8..d01b999 100755 --- a/main.py +++ b/main.py @@ -33,9 +33,9 @@ def ReportError(script, e): lastpos = fieldpos(script, '\n', e.lno+1)-1 assert lastpos != -1 if lastpos < -1: lastpos = len(script) # may hit EOF - sys.stderr.write(script[fieldpos(script, '\n', e.lno):lastpos] + '\n') - sys.stderr.write(' ' * e.cno + '^\n') - sys.stderr.write(e[0] + '\n') + sys.stderr.write(script[fieldpos(script, '\n', e.lno):lastpos].decode('utf8') + u"\n") + sys.stderr.write(u" " * e.cno + u"^\n") + sys.stderr.write(e.args[0] + u"\n") class UniConvScript(object): """Converts the script to Unicode, setting the properties required by @@ -497,7 +497,7 @@ def main(argv): except EParse as e: # We don't call ReportError to prevent problems due to # displaying invalid UTF-8 - sys.stderr.write(e[0] + '\n') + sys.stderr.write(e.args[0] + u"\n") return 1 if preproc != 'none':