BaseTools: Use absolute import in AutoGen

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/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 289309fff0bbc454f45bb5eafe53dfa2b7b639ce..c5ab334459dc668ecaa5cea521f0dbd7aceb08d9 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -16,19 +16,20 @@
 ## Import Modules\r
 #\r
 from __future__ import print_function\r
 ## Import Modules\r
 #\r
 from __future__ import print_function\r

+from __future__ import absolute_import\r

 import Common.LongFilePathOs as os\r
 import re\r
 import os.path as path\r
 import copy\r
 import uuid\r
 \r
 import Common.LongFilePathOs as os\r
 import re\r
 import os.path as path\r
 import copy\r
 import uuid\r
 \r

-import GenC\r
-import GenMake\r
-import GenDepex\r
+from . import GenC\r
+from . import GenMake\r
+from . import GenDepex\r

 from io import BytesIO\r
 \r
 from io import BytesIO\r
 \r

-from StrGather import *\r
-from BuildEngine import BuildRule\r
+from .StrGather import *\r
+from .BuildEngine import BuildRule\r

 \r
 from Common.LongFilePathSupport import CopyLongFilePath\r
 from Common.BuildToolError import *\r
 \r
 from Common.LongFilePathSupport import CopyLongFilePath\r
 from Common.BuildToolError import *\r


@@ -41,14 +42,14 @@ from CommonDataClass.CommonClass import SkuInfoClass
 from Workspace.BuildClassObject import *\r
 from GenPatchPcdTable.GenPatchPcdTable import parsePcdInfoFromMapFile\r
 import Common.VpdInfoFile as VpdInfoFile\r
 from Workspace.BuildClassObject import *\r
 from GenPatchPcdTable.GenPatchPcdTable import parsePcdInfoFromMapFile\r
 import Common.VpdInfoFile as VpdInfoFile\r

-from GenPcdDb import CreatePcdDatabaseCode\r
+from .GenPcdDb import CreatePcdDatabaseCode\r

 from Workspace.MetaFileCommentParser import UsageList\r
 from Workspace.WorkspaceCommon import GetModuleLibInstances\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 from Workspace.MetaFileCommentParser import UsageList\r
 from Workspace.WorkspaceCommon import GetModuleLibInstances\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r

-import InfSectionParser\r
+from . import InfSectionParser\r

 import datetime\r
 import hashlib\r
 import datetime\r
 import hashlib\r

-from GenVar import VariableMgr, var_info\r
+from .GenVar import VariableMgr, var_info\r

 from collections import OrderedDict\r
 from collections import defaultdict\r
 from Workspace.WorkspaceCommon import OrderedListDict\r
 from collections import OrderedDict\r
 from collections import defaultdict\r
 from Workspace.WorkspaceCommon import OrderedListDict\r

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 2dca9ffd5b4b927fb48d7cc7d74631902007eaed..3b396491d0235020c3567850a0018d771d34ed81 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -13,6 +13,7 @@
 \r
 ## Import Modules\r
 #\r
 \r
 ## Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import string\r
 import collections\r
 import struct\r
 import string\r
 import collections\r
 import struct\r


@@ -22,9 +23,9 @@ from Common.BuildToolError import *
 from Common.DataType import *\r
 from Common.Misc import *\r
 from Common.StringUtils import StringToArray\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from Common.StringUtils import StringToArray\r

-from StrGather import *\r
-from GenPcdDb import CreatePcdDatabaseCode\r
-from IdfClassObject import *\r
+from .StrGather import *\r
+from .GenPcdDb import CreatePcdDatabaseCode\r
+from .IdfClassObject import *\r

 \r
 ## PCD type string\r
 gItemTypeStringDatabase  = {\r
 \r
 ## PCD type string\r
 gItemTypeStringDatabase  = {\r

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 992de5490dff9ffc2fc2067b6e64449bffac8ad0..f1dc14754154fce247701bb0465b9d79a4bd359a 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -13,6 +13,7 @@
 \r
 ## Import Modules\r
 #\r
 \r
 ## Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import Common.LongFilePathOs as os\r
 import sys\r
 import string\r
 import Common.LongFilePathOs as os\r
 import sys\r
 import string\r


@@ -23,7 +24,7 @@ from Common.MultipleWorkspace import MultipleWorkspace as mws
 from Common.BuildToolError import *\r
 from Common.Misc import *\r
 from Common.StringUtils import *\r
 from Common.BuildToolError import *\r
 from Common.Misc import *\r
 from Common.StringUtils import *\r

-from BuildEngine import *\r
+from .BuildEngine import *\r

 import Common.GlobalData as GlobalData\r
 from collections import OrderedDict\r
 \r
 import Common.GlobalData as GlobalData\r
 from collections import OrderedDict\r
 \r

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index c90b814e7dbd88e876171eb9946410176c969881..2176bbefeb52afdaf4e887b98db56c61a95e909c 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -10,13 +10,14 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r

+from __future__ import absolute_import\r

 from io import BytesIO\r
 from Common.Misc import *\r
 from Common.StringUtils import StringToArray\r
 from struct import pack\r
 from io import BytesIO\r
 from Common.Misc import *\r
 from Common.StringUtils import StringToArray\r
 from struct import pack\r

-from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER\r
-from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB\r
-from ValidCheckingInfoObject import GetValidationObject\r
+from .ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER\r
+from .ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB\r
+from .ValidCheckingInfoObject import GetValidationObject\r

 from Common.VariableAttributes import VariableAttributes\r
 import copy\r
 from struct import unpack\r
 from Common.VariableAttributes import VariableAttributes\r
 import copy\r
 from struct import unpack\r

diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/Source/Python/AutoGen/IdfClassObject.py
index b656bd83e3ba27b2dd959d81a49e183ac65e8c6b..b227b10258da8b73bcc7414f68e8aee0b5e30a1c 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py
@@ -13,6 +13,7 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import Common.EdkLogger as EdkLogger\r
 from Common.BuildToolError import *\r
 from Common.StringUtils import GetLineNo\r
 import Common.EdkLogger as EdkLogger\r
 from Common.BuildToolError import *\r
 from Common.StringUtils import GetLineNo\r


@@ -21,7 +22,7 @@ from Common.LongFilePathSupport import LongFilePath
 import re\r
 import os\r
 from Common.GlobalData import gIdentifierPattern\r
 import re\r
 import os\r
 from Common.GlobalData import gIdentifierPattern\r

-from UniClassObject import StripComments\r
+from .UniClassObject import StripComments\r

 \r
 IMAGE_TOKEN = re.compile('IMAGE_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE)\r
 \r
 \r
 IMAGE_TOKEN = re.compile('IMAGE_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE | re.UNICODE)\r
 \r

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index a702ef0dd583df6648a1ef887e5a8ee29cfd41d6..361d499076850042adfd03f6587457a1876700b4 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -14,10 +14,11 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import re\r
 import Common.EdkLogger as EdkLogger\r
 from Common.BuildToolError import *\r
 import re\r
 import Common.EdkLogger as EdkLogger\r
 from Common.BuildToolError import *\r

-from UniClassObject import *\r
+from .UniClassObject import *\r

 from io import BytesIO\r
 from struct import pack, unpack\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from io import BytesIO\r
 from struct import pack, unpack\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r