BaseTools: Fix old python2 idioms

[mirror_edk2.git] / BaseTools / Source / Python / Common / StringUtils.py

diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Source/Python/Common/StringUtils.py
index 34361ecdd58c0bfacabda0e9a09797f060df1368..3f6bae3bdc39c740eb43ff7dc5151baded35eba9 100644 (file)
--- a/BaseTools/Source/Python/Common/StringUtils.py
+++ b/BaseTools/Source/Python/Common/StringUtils.py
@@ -251,7 +251,7 @@ def SplitModuleType(Key):
 def ReplaceMacros(StringList, MacroDefinitions={}, SelfReplacement=False):\r
     NewList = []\r
     for String in StringList:\r
-        if type(String) == type(''):\r
+        if isinstance(String, type('')):\r
             NewList.append(ReplaceMacro(String, MacroDefinitions, SelfReplacement))\r
         else:\r
             NewList.append(String)\r
@@ -447,7 +447,7 @@ def GetMultipleValuesOfKeyFromLines(Lines, Key, KeyValues, CommentCharacter):
     for Line in LineList:\r
         Line = CleanString(Line, CommentCharacter)\r
         if Line != '' and Line[0] != CommentCharacter:\r
-            KeyValues += [Line]\r
+            KeyValues.append(Line)\r
 \r
     return True\r
 \r
@@ -750,7 +750,7 @@ def SplitString(String):
 # @param StringList:  A list for strings to be converted\r
 #\r
 def ConvertToSqlString(StringList):\r
-    return map(lambda s: s.replace("'", "''") , StringList)\r
+    return map(lambda s: s.replace("'", "''"), StringList)\r
 \r
 ## Convert To Sql String\r
 #\r
@@ -793,7 +793,7 @@ def RemoveBlockComment(Lines):
 # Get String of a List\r
 #\r
 def GetStringOfList(List, Split=' '):\r
-    if type(List) != type([]):\r
+    if not isinstance(List, type([])):\r
         return List\r
     Str = ''\r
     for Item in List:\r