From c60377d7f9ec80ecc7fe76c38b81ffd98b7ef2e4 Mon Sep 17 00:00:00 2001 From: "Feng, Bob C" Date: Fri, 4 Jan 2019 17:35:10 +0800 Subject: BaseTools: ECC tool Python3 adaption v2: The python files under CParser4 are generated by antlr4 and for python3 usage. They have python3 specific syntax, for example the data type declaration for the arguments of a function. That is not compitable with python2. this patch is to remove these syntax. ECC tool Python3 adaption. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Bob Feng Cc: Liming Gao Tested-by: Laszlo Ersek Tested-by: Ard Biesheuvel Reviewed-by: Liming Gao --- BaseTools/Source/Python/Ecc/Check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/Python/Ecc/Check.py') diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py index dfcc0302bc..a6c62359d0 100644 --- a/BaseTools/Source/Python/Ecc/Check.py +++ b/BaseTools/Source/Python/Ecc/Check.py @@ -223,7 +223,7 @@ class Check(object): IndexOfLine = 0 for Line in op: IndexOfLine += 1 - if not Line.endswith('\r\n'): + if not bytes.decode(Line).endswith('\r\n'): OtherMsg = "File %s has invalid line ending at line %s" % (Record[1], IndexOfLine) EccGlobalData.gDb.TblReport.Insert(ERROR_GENERAL_CHECK_INVALID_LINE_ENDING, OtherMsg=OtherMsg, BelongsToTable='File', BelongsToItem=Record[0]) @@ -235,7 +235,7 @@ class Check(object): RecordSet = EccGlobalData.gDb.TblFile.Exec(SqlCommand) for Record in RecordSet: if Record[2].upper() not in EccGlobalData.gConfig.BinaryExtList: - op = open(Record[1], 'rb').readlines() + op = open(Record[1], 'r').readlines() IndexOfLine = 0 for Line in op: IndexOfLine += 1 -- cgit v1.2.3