BaseTools/UPT: Porting UPT Tool from Python2 to Python3

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Library / StringUtils.py

diff --git a/BaseTools/Source/Python/UPT/Library/StringUtils.py b/BaseTools/Source/Python/UPT/Library/StringUtils.py
index c2148a44fb078b35c37c79c93f98c37d7b4ca001..011eb98ca6963f117a1e72dcdd24720a15ebe9a4 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/StringUtils.py
+++ b/BaseTools/Source/Python/UPT/Library/StringUtils.py
@@ -20,7 +20,6 @@ StringUtils
 #\r
 import re\r
 import os.path\r
-from string import strip\r
 import Logger.Log as Logger\r
 import Library.DataType as DataType\r
 from Logger.ToolError import FORMAT_INVALID\r
@@ -44,7 +43,7 @@ gMACRO_PATTERN = re.compile("\$\(([_A-Z][_A-Z0-9]*)\)", re.UNICODE)
 #\r
 #\r
 def GetSplitValueList(String, SplitTag=DataType.TAB_VALUE_SPLIT, MaxSplit= -1):\r
-    return map(lambda l: l.strip(), String.split(SplitTag, MaxSplit))\r
+    return list(map(lambda l: l.strip(), String.split(SplitTag, MaxSplit)))\r
 \r
 ## MergeArches\r
 #\r
@@ -435,7 +434,7 @@ def GetSingleValueOfKeyFromLines(Lines, Dictionary, CommentCharacter, KeySplitCh
                 #\r
                 LineList[1] = CleanString(LineList[1], CommentCharacter)\r
                 if ValueSplitFlag:\r
-                    Value = map(strip, LineList[1].split(ValueSplitCharacter))\r
+                    Value = map(lambda x: x.strip(), LineList[1].split(ValueSplitCharacter))\r
                 else:\r
                     Value = CleanString(LineList[1], CommentCharacter).splitlines()\r
 \r
@@ -502,7 +501,7 @@ def PreCheck(FileName, FileContent, SupSectionTag):
         #\r
         # Regenerate FileContent\r
         #\r
-        NewFileContent = NewFileContent + Line + '\r\n'\r
+        NewFileContent = NewFileContent + Line + '\n'\r
 \r
     if IsFailed:\r
         Logger.Error("Parser", FORMAT_INVALID, Line=LineNo, File=FileName, RaiseError=Logger.IS_RAISE_ERROR)\r
@@ -938,14 +937,14 @@ def SplitPcdEntry(String):
 def IsMatchArch(Arch1, Arch2):\r
     if 'COMMON' in Arch1 or 'COMMON' in Arch2:\r
         return True\r
-    if isinstance(Arch1, basestring) and isinstance(Arch2, basestring):\r
+    if isinstance(Arch1, str) and isinstance(Arch2, str):\r
         if Arch1 == Arch2:\r
             return True\r
 \r
-    if isinstance(Arch1, basestring) and isinstance(Arch2, list):\r
+    if isinstance(Arch1, str) and isinstance(Arch2, list):\r
         return Arch1 in Arch2\r
 \r
-    if isinstance(Arch2, basestring) and isinstance(Arch1, list):\r
+    if isinstance(Arch2, str) and isinstance(Arch1, list):\r
         return Arch2 in Arch1\r
 \r
     if isinstance(Arch1, list) and isinstance(Arch2, list):\r