From 1b2e077260030290c512f3ac71a044ed1150899f Mon Sep 17 00:00:00 2001 From: Yonghong Zhu Date: Tue, 4 Sep 2018 10:39:47 +0800 Subject: BaseTools/UPT: Porting UPT Tool from Python2 to Python3 Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- .../Source/Python/UPT/Library/UniClassObject.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'BaseTools/Source/Python/UPT/Library/UniClassObject.py') diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py index 670cf3b4ee..549f278b05 100644 --- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py +++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py @@ -14,7 +14,6 @@ """ Collect all defined strings in multiple uni files """ -from __future__ import print_function ## # Import Modules @@ -247,9 +246,9 @@ def FormatUniEntry(StrTokenName, TokenValueList, ContainerFile): for SubValue in ValueList: if SubValue.strip(): SubValueContent += \ - ' ' * (PreFormatLength + len('#language en-US ')) + '\"%s\\n\"' % SubValue.strip() + '\r\n' + ' ' * (PreFormatLength + len('#language en-US ')) + '\"%s\\n\"' % SubValue.strip() + '\n' SubValueContent = SubValueContent[(PreFormatLength + len('#language en-US ')):SubValueContent.rfind('\\n')] \ - + '\"' + '\r\n' + + '\"' + '\n' SubContent += ' '*PreFormatLength + '#language %-5s ' % Lang + SubValueContent if SubContent: SubContent = StrTokenName + ' '*(PreFormatLength - len(StrTokenName)) + SubContent[PreFormatLength:] @@ -291,7 +290,7 @@ class StringDefClassObject(object): def UpdateValue(self, Value = None): if Value is not None: if self.StringValue: - self.StringValue = self.StringValue + '\r\n' + Value + self.StringValue = self.StringValue + '\n' + Value else: self.StringValue = Value self.StringValueByteList = UniToHexList(self.StringValue) @@ -465,7 +464,7 @@ class UniFileClassObject(object): if not Line.startswith(DT.TAB_COMMENT_EDK1_SPLIT) and HeaderStart and not HeaderEnd: HeaderEnd = True if Line.startswith(DT.TAB_COMMENT_EDK1_SPLIT) and HeaderStart and not HeaderEnd and FirstGenHeader: - self.UniFileHeader += Line + '\r\n' + self.UniFileHeader += Line + '\n' continue # @@ -511,11 +510,11 @@ class UniFileClassObject(object): if FileIn[LineCount].strip().startswith('#language'): Line = Line + FileIn[LineCount] FileIn[LineCount-1] = Line - FileIn[LineCount] = '\r\n' + FileIn[LineCount] = '\n' LineCount -= 1 - for Index in xrange (LineCount + 1, len (FileIn) - 1): + for Index in range (LineCount + 1, len (FileIn) - 1): if (Index == len(FileIn) -1): - FileIn[Index] = '\r\n' + FileIn[Index] = '\n' else: FileIn[Index] = FileIn[Index + 1] continue @@ -867,12 +866,12 @@ class UniFileClassObject(object): Value = Value + Lines[IndexJ].strip()[1:-1] CombineToken = False else: - Value = Value + Lines[IndexJ].strip()[1:-1] + '\r\n' + Value = Value + Lines[IndexJ].strip()[1:-1] + '\n' else: IndexI = IndexJ break - if Value.endswith('\r\n'): - Value = Value[: Value.rfind('\r\n')] + if Value.endswith('\n'): + Value = Value[: Value.rfind('\n')] Language = GetLanguageCode(Language, self.IsCompatibleMode, self.File) self.AddStringToList(Name, Language, Value) continue -- cgit v1.2.3