##\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
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
# 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
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