BaseTools: Use absolute import in Common

[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..da2949dbadef0848596e7da12db48ed5a84cd4f7 100644 (file)
--- a/BaseTools/Source/Python/Common/StringUtils.py
+++ b/BaseTools/Source/Python/Common/StringUtils.py
@@ -14,14 +14,15 @@
 ##\r
 # Import Modules\r
 #\r
+from __future__ import absolute_import\r
 import re\r
-import DataType\r
+from . import DataType\r
 import Common.LongFilePathOs as os\r
 import string\r
-import EdkLogger as EdkLogger\r
+from . import EdkLogger as EdkLogger\r
 \r
-import GlobalData\r
-from BuildToolError import *\r
+from . import GlobalData\r
+from .BuildToolError import *\r
 from CommonDataClass.Exceptions import *\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
@@ -251,7 +252,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 +448,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 +751,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 +794,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
@@ -839,7 +840,7 @@ def StringToArray(String):
             return "{%s,0x00}" % ",".join(C.strip() for C in String[1:-1].split(','))\r
         else:\r
             return "{%s}" % ",".join(C.strip() for C in String[1:-1].split(','))\r
-        \r
+\r
     else:\r
         if len(String.split()) % 2:\r
             return '{%s,0}' % ','.join(String.split())\r