import Common.EdkLogger as EdkLogger\r
from Common.DataType import *\r
from CommonDataClass.DataClass import *\r
-from Common.String import CleanString, GetSplitValueList, ReplaceMacro\r
+from Common.StringUtils import CleanString, GetSplitValueList, ReplaceMacro\r
import EotGlobalData\r
-from Common.Misc import sdict\r
-from Common.String import GetSplitList\r
+from Common.StringUtils import GetSplitList\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
\r
## PreProcess() method\r
# @param ItemMode: Mode of item\r
#\r
def SearchFunctionCalling(Table, SourceFileID, SourceFileFullPath, ItemType, ItemMode):\r
- LibraryList = sdict()\r
+ LibraryList = {}\r
Db = EotGlobalData.gDb.TblReport\r
Parameters, ItemName, GuidName, GuidMacro, GuidValue, BelongsToFunction = [], '', '', '', '', ''\r
if ItemType == 'Protocol' and ItemMode == 'Produced':\r
# @return: The name of parameter\r
#\r
def GetParameterName(Parameter):\r
- if type(Parameter) == type('') and Parameter.startswith('&'):\r
+ if isinstance(Parameter, type('')) and Parameter.startswith('&'):\r
return Parameter[1:].replace('{', '').replace('}', '').replace('\r', '').replace('\n', '').strip()\r
else:\r
return Parameter.strip()\r