From 99ed4b6de662d7b9f647bf5c95cb34dbcabe8bd6 Mon Sep 17 00:00:00 2001 From: Ben Hamilton Date: Wed, 25 Jan 2017 16:33:14 -0800 Subject: [PATCH] Python StdinStream/FileStream -> UTF-8 --- runtime/Python2/src/antlr4/FileStream.py | 4 ++-- runtime/Python2/src/antlr4/StdinStream.py | 6 +++--- runtime/Python3/src/antlr4/FileStream.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/runtime/Python2/src/antlr4/FileStream.py b/runtime/Python2/src/antlr4/FileStream.py index ae5d8d4e7..2b48ea794 100644 --- a/runtime/Python2/src/antlr4/FileStream.py +++ b/runtime/Python2/src/antlr4/FileStream.py @@ -16,12 +16,12 @@ from antlr4.InputStream import InputStream class FileStream(InputStream): - def __init__(self, fileName, encoding='ascii'): + def __init__(self, fileName, encoding='utf-8', errors='replace'): self.fileName = fileName # read binary to avoid line ending conversion with open(fileName, 'rb') as file: bytes = file.read() - data = codecs.decode(bytes, encoding) + data = codecs.decode(bytes, encoding, errors) super(type(self), self).__init__(data) diff --git a/runtime/Python2/src/antlr4/StdinStream.py b/runtime/Python2/src/antlr4/StdinStream.py index 382db85a0..7e8352c8e 100644 --- a/runtime/Python2/src/antlr4/StdinStream.py +++ b/runtime/Python2/src/antlr4/StdinStream.py @@ -15,7 +15,7 @@ from antlr4.InputStream import InputStream class StdinStream(InputStream): - def __init__(self, encoding='ascii'): + def __init__(self, encoding='utf-8', errors='replace'): bytes = sys.stdin.read() - data = codecs.decode(bytes, encoding) - super(type(self), self).__init__(data) \ No newline at end of file + data = codecs.decode(bytes, encoding, errors) + super(type(self), self).__init__(data) diff --git a/runtime/Python3/src/antlr4/FileStream.py b/runtime/Python3/src/antlr4/FileStream.py index 92b97bbb3..e1d0038d0 100644 --- a/runtime/Python3/src/antlr4/FileStream.py +++ b/runtime/Python3/src/antlr4/FileStream.py @@ -16,15 +16,15 @@ from antlr4.InputStream import InputStream class FileStream(InputStream): - def __init__(self, fileName:str, encoding:str='ascii'): - super().__init__(self.readDataFrom(fileName, encoding)) + def __init__(self, fileName:str, encoding:str='utf-8', errors:str='replace'): + super().__init__(self.readDataFrom(fileName, encoding, errors)) self.fileName = fileName - def readDataFrom(self, fileName:str, encoding:str): + def readDataFrom(self, fileName:str, encoding:str, errors:str='replace'): # read binary to avoid line ending conversion with open(fileName, 'rb') as file: bytes = file.read() - return codecs.decode(bytes, encoding) + return codecs.decode(bytes, encoding, errors) class TestFileStream(unittest.TestCase):