BaseTools: Use absolute import in Eot

[mirror_edk2.git] / BaseTools / Source / Python / Eot / Parser.py

diff --git a/BaseTools/Source/Python/Eot/Parser.py b/BaseTools/Source/Python/Eot/Parser.py
index d5419d0e06618b3e8c1a93aef31cd3389b5b6306..e01a9770befbc7d3340d79c41e153b67571184ae 100644 (file)
--- a/BaseTools/Source/Python/Eot/Parser.py
+++ b/BaseTools/Source/Python/Eot/Parser.py
@@ -2,7 +2,7 @@
 # This file is used to define common parsing related functions used in parsing\r
 # Inf/Dsc/Makefile process\r
 #\r
-# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -15,14 +15,15 @@
 ##\r
 # Import Modules\r
 #\r
-import os, re\r
+from __future__ import absolute_import\r
+import Common.LongFilePathOs as os, re\r
 import Common.EdkLogger as EdkLogger\r
 from Common.DataType import *\r
 from CommonDataClass.DataClass import *\r
-from Common.String import CleanString, GetSplitValueList, ReplaceMacro\r
-import EotGlobalData\r
-from Common.Misc import sdict\r
-from Common.String import GetSplitList\r
+from Common.StringUtils import CleanString, GetSplitValueList, ReplaceMacro\r
+from . import EotGlobalData\r
+from Common.StringUtils import GetSplitList\r
+from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 ## PreProcess() method\r
 #\r
@@ -622,7 +623,7 @@ def SearchProtocols(SqlCommand, Table, SourceFileID, SourceFileFullPath, ItemMod
 #  @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
@@ -730,7 +731,7 @@ def GetParameter(Parameter, Index = 1):
 #  @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