BaseTools: Use absolute import in Eot

Based on "futurize -f libfuturize.fixes.fix_absolute_import

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/BaseTools/Source/Python/Eot/CParser.py b/BaseTools/Source/Python/Eot/CParser.py
index b66ac2d8d5450f857cd069f34cebec9d7161274c..0b74b53ae7a5eafeaee8d78c3a3783f5dfcee703 100644 (file)
--- a/BaseTools/Source/Python/Eot/CParser.py
+++ b/BaseTools/Source/Python/Eot/CParser.py
@@ -1,6 +1,7 @@
 # $ANTLR 3.0.1 C.g 2010-02-23 09:58:53\r
 \r
 from __future__ import print_function\r
+from __future__ import absolute_import\r
 from antlr3 import *\r
 from antlr3.compat import set, frozenset\r
 \r
@@ -23,8 +24,8 @@ from antlr3.compat import set, frozenset
 #\r
 ##\r
 \r
-import CodeFragment\r
-import FileProfile\r
+from . import CodeFragment\r
+from . import FileProfile\r
 \r
 \r
 \r

diff --git a/BaseTools/Source/Python/Eot/CodeFragmentCollector.py b/BaseTools/Source/Python/Eot/CodeFragmentCollector.py
index 1e30e2ce62e284c21f12e48474ea20d09e2a2314..8a5e5df17e5aff5e34011e833becff72771e44b2 100644 (file)
--- a/BaseTools/Source/Python/Eot/CodeFragmentCollector.py
+++ b/BaseTools/Source/Python/Eot/CodeFragmentCollector.py
@@ -16,17 +16,18 @@
 # Import Modules\r
 #\r
 from __future__ import print_function\r
+from __future__ import absolute_import\r
 import re\r
 import Common.LongFilePathOs as os\r
 import sys\r
 \r
 import antlr3\r
-from CLexer import CLexer\r
-from CParser import CParser\r
+from .CLexer import CLexer\r
+from .CParser import CParser\r
 \r
-import FileProfile\r
-from CodeFragment import PP_Directive\r
-from ParserWarning import Warning\r
+from . import FileProfile\r
+from .CodeFragment import PP_Directive\r
+from .ParserWarning import Warning\r
 \r
 \r
 ##define T_CHAR_SPACE                ' '\r

diff --git a/BaseTools/Source/Python/Eot/Eot.py b/BaseTools/Source/Python/Eot/Eot.py
index 297847cdab9167da8c468e178c8572896ccd46a1..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.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

diff --git a/BaseTools/Source/Python/Eot/FileProfile.py b/BaseTools/Source/Python/Eot/FileProfile.py
index 0544c0d55b44fd07c63a73ef8701d692840841a5..3846279cad4ccffee8db492940e7842701352394 100644 (file)
--- a/BaseTools/Source/Python/Eot/FileProfile.py
+++ b/BaseTools/Source/Python/Eot/FileProfile.py
@@ -16,9 +16,10 @@
 # Import Modules\r
 #\r
 \r
+from __future__ import absolute_import\r
 import re\r
 import Common.LongFilePathOs as os\r
-from ParserWarning import Warning\r
+from .ParserWarning import Warning\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 # Profile contents of a file\r

diff --git a/BaseTools/Source/Python/Eot/InfParserLite.py b/BaseTools/Source/Python/Eot/InfParserLite.py
index 24f0d50246e5ba131bfc78ce0e9794d342e3f4ae..88d7e7d58e0bbe022240c83382c8693ccdd2544a 100644 (file)
--- a/BaseTools/Source/Python/Eot/InfParserLite.py
+++ b/BaseTools/Source/Python/Eot/InfParserLite.py
@@ -15,14 +15,15 @@
 # Import Modules\r
 #\r
 from __future__ import print_function\r
+from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 import Common.EdkLogger as EdkLogger\r
 from Common.DataType import *\r
 from CommonDataClass.DataClass import *\r
 from Common.Identification import *\r
 from Common.StringUtils import *\r
-from Parser import *\r
-import Database\r
+from .Parser import *\r
+from . import Database\r
 \r
 ## EdkInfParser() class\r
 #\r

diff --git a/BaseTools/Source/Python/Eot/Parser.py b/BaseTools/Source/Python/Eot/Parser.py
index 0b720d5b2187c6962dc264a45fe8daec3f30c384..e01a9770befbc7d3340d79c41e153b67571184ae 100644 (file)
--- a/BaseTools/Source/Python/Eot/Parser.py
+++ b/BaseTools/Source/Python/Eot/Parser.py
@@ -15,12 +15,13 @@
 ##\r
 # Import Modules\r
 #\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.StringUtils import CleanString, GetSplitValueList, ReplaceMacro\r
-import EotGlobalData\r
+from . import EotGlobalData\r
 from Common.StringUtils import GetSplitList\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r

diff --git a/BaseTools/Source/Python/Eot/Report.py b/BaseTools/Source/Python/Eot/Report.py
index e9716c988c8b4a9569c8cd1c7ad15718e1612569..4ddddb1034013670bafb10ee78c095c45a285475 100644 (file)
--- a/BaseTools/Source/Python/Eot/Report.py
+++ b/BaseTools/Source/Python/Eot/Report.py
@@ -14,8 +14,9 @@
 ##\r
 # Import Modules\r
 #\r
+from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
-import EotGlobalData\r
+from . import EotGlobalData\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 ## Report() class\r

diff --git a/BaseTools/Source/Python/Eot/c.py b/BaseTools/Source/Python/Eot/c.py
index ceefc952237f222439464505a9f13f390e45fb15..4f0b58a52c79ebc1eb0f26d1de664caec414c60c 100644 (file)
--- a/BaseTools/Source/Python/Eot/c.py
+++ b/BaseTools/Source/Python/Eot/c.py
@@ -16,15 +16,16 @@
 # Import Modules\r
 #\r
 from __future__ import print_function\r
+from __future__ import absolute_import\r
 import sys\r
 import Common.LongFilePathOs as os\r
 import re\r
-import CodeFragmentCollector\r
-import FileProfile\r
+from . import CodeFragmentCollector\r
+from . import FileProfile\r
 from CommonDataClass import DataClass\r
 from Common import EdkLogger\r
-from EotToolError import *\r
-import EotGlobalData\r
+from .EotToolError import *\r
+from . import EotGlobalData\r
 \r
 # Global Dicts\r
 IncludeFileListDict = {}\r