BaseTools: Use absolute import in Eot

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

diff --git a/BaseTools/Source/Python/Eot/Eot.py b/BaseTools/Source/Python/Eot/Eot.py
index 786868d55d99334e8f27faf691def009e7e7c2b8..6fb882642bff94022aa37dc2204a611706926792 100644 (file)
--- a/BaseTools/Source/Python/Eot/Eot.py
+++ b/BaseTools/Source/Python/Eot/Eot.py
@@ -14,20 +14,21 @@
 ##\r
 # Import Modules\r
 #\r
+from __future__ import absolute_import\r
 import Common.LongFilePathOs as os, time, glob\r
 import Common.EdkLogger as EdkLogger\r
-import EotGlobalData\r
+from . import EotGlobalData\r
 from optparse import OptionParser\r
-from Common.String import NormPath\r
+from Common.StringUtils import NormPath\r
 from Common import BuildToolError\r
 from Common.Misc import GuidStructureStringToGuidString, sdict\r
-from InfParserLite import *\r
-import c\r
-import Database\r
+from .InfParserLite import *\r
+from . import c\r
+from . import Database\r
 from array import array\r
-from Report import Report\r
+from .Report import Report\r
 from Common.BuildVersion import gBUILD_VERSION\r
-from Parser import ConvertGuid\r
+from .Parser import ConvertGuid\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 import struct\r
 import uuid\r
@@ -153,7 +154,7 @@ class CompressedImage(Image):
 \r
     def _GetSections(m):\r
         try:\r
-            import EfiCompressor\r
+            from . import EfiCompressor\r
             TmpData = EfiCompressor.FrameworkDecompress(\r
                                         m[m._HEADER_SIZE_:],\r
                                         len(m) - m._HEADER_SIZE_\r
@@ -161,7 +162,7 @@ class CompressedImage(Image):
             DecData = array('B')\r
             DecData.fromstring(TmpData)\r
         except:\r
-            import EfiCompressor\r
+            from . import EfiCompressor\r
             TmpData = EfiCompressor.UefiDecompress(\r
                                         m[m._HEADER_SIZE_:],\r
                                         len(m) - m._HEADER_SIZE_\r
@@ -748,7 +749,7 @@ class GuidDefinedImage(Image):
                 SectionList.append(Sec)\r
         elif Guid == m.TIANO_COMPRESS_GUID:\r
             try:\r
-                import EfiCompressor\r
+                from . import EfiCompressor\r
                 # skip the header\r
                 Offset = m.DataOffset - 4\r
                 TmpData = EfiCompressor.FrameworkDecompress(m[Offset:], len(m)-Offset)\r
@@ -769,7 +770,7 @@ class GuidDefinedImage(Image):
                 pass\r
         elif Guid == m.LZMA_COMPRESS_GUID:\r
             try:\r
-                import LzmaCompressor\r
+                from . import LzmaCompressor\r
                 # skip the header\r
                 Offset = m.DataOffset - 4\r
                 TmpData = LzmaCompressor.LzmaDecompress(m[Offset:], len(m)-Offset)\r
@@ -1491,7 +1492,7 @@ class MultipleFv(FirmwareVolume):
             Fv.frombuffer(Buf, 0, len(Buf))\r
 \r
             self.BasicInfo.append([Fv.Name, Fv.FileSystemGuid, Fv.Size])\r
-            self.FfsDict.append(Fv.FfsDict)    \r
+            self.FfsDict.append(Fv.FfsDict)\r
 \r
 ## Class Eot\r
 #\r
@@ -1510,7 +1511,7 @@ class Eot(object):
         # Version and Copyright\r
         self.VersionNumber = ("0.02" + " " + gBUILD_VERSION)\r
         self.Version = "%prog Version " + self.VersionNumber\r
-        self.Copyright = "Copyright (c) 2008 - 2010, Intel Corporation  All rights reserved."\r
+        self.Copyright = "Copyright (c) 2008 - 2018, Intel Corporation  All rights reserved."\r
         self.Report = Report\r
 \r
         self.IsInit = IsInit\r
@@ -1522,7 +1523,7 @@ class Eot(object):
         self.FvFileList = FvFileList\r
         self.MapFileList = MapFileList\r
         self.Dispatch = Dispatch\r
-        \r
+\r
         # Check workspace environment\r
         if "EFI_SOURCE" not in os.environ:\r
             if "EDK_SOURCE" not in os.environ:\r
@@ -1562,13 +1563,13 @@ class Eot(object):
                 if not os.path.isfile(MapFile):\r
                     EdkLogger.error("Eot", EdkLogger.EOT_ERROR, "Can not find file %s " % MapFile)\r
                 EotGlobalData.gMAP_FILE.append(MapFile)\r
-                \r
+\r
         # Generate source file list\r
         self.GenerateSourceFileList(self.SourceFileList, self.IncludeDirList)\r
 \r
         # Generate guid list of dec file list\r
         self.ParseDecFile(self.DecFileList)\r
-        \r
+\r
         # Generate guid list from GUID list file\r
         self.ParseGuidList(self.GuidList)\r
 \r
@@ -1628,7 +1629,7 @@ class Eot(object):
                         if len(list) == 2:\r
                             EotGlobalData.gGuidDict[list[0].strip()] = GuidStructureStringToGuidString(list[1].strip())\r
 \r
-    \r
+\r
     ## ParseGuidList() method\r
     #\r
     #  Parse Guid list and get all GUID names with GUID values as {GuidName : GuidValue}\r
@@ -1643,7 +1644,7 @@ class Eot(object):
             for Line in open(Path):\r
                 (GuidName, GuidValue) = Line.split()\r
                 EotGlobalData.gGuidDict[GuidName] = GuidValue\r
-            \r
+\r
     ## ConvertLogFile() method\r
     #\r
     #  Parse a real running log file to get real dispatch order\r
@@ -1999,7 +2000,7 @@ class Eot(object):
 \r
         if Options.FvFileList:\r
             self.FvFileList = Options.FvFileList\r
- \r
+\r
         if Options.MapFileList:\r
             self.MapFileList = Options.FvMapFileList\r
 \r
@@ -2011,7 +2012,7 @@ class Eot(object):
 \r
         if Options.DecFileList:\r
             self.DecFileList = Options.DecFileList\r
-        \r
+\r
         if Options.GuidList:\r
             self.GuidList = Options.GuidList\r
 \r