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>

6 files changed, 23 insertions, 17 deletions

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 289309fff0..c5ab334459 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -16,19 +16,20 @@
 ## Import Modules

 #

 from __future__ import print_function

+from __future__ import absolute_import

 import Common.LongFilePathOs as os

 import re

 import os.path as path

 import copy

 import uuid

 

-import GenC

-import GenMake

-import GenDepex

+from . import GenC

+from . import GenMake

+from . import GenDepex

 from io import BytesIO

 

-from StrGather import *

-from BuildEngine import BuildRule

+from .StrGather import *

+from .BuildEngine import BuildRule

 

 from Common.LongFilePathSupport import CopyLongFilePath

 from Common.BuildToolError import *

@@ -41,14 +42,14 @@ from CommonDataClass.CommonClass import SkuInfoClass
 from Workspace.BuildClassObject import *

 from GenPatchPcdTable.GenPatchPcdTable import parsePcdInfoFromMapFile

 import Common.VpdInfoFile as VpdInfoFile

-from GenPcdDb import CreatePcdDatabaseCode

+from .GenPcdDb import CreatePcdDatabaseCode

 from Workspace.MetaFileCommentParser import UsageList

 from Workspace.WorkspaceCommon import GetModuleLibInstances

 from Common.MultipleWorkspace import MultipleWorkspace as mws

-import InfSectionParser

+from . import InfSectionParser

 import datetime

 import hashlib

-from GenVar import VariableMgr, var_info

+from .GenVar import VariableMgr, var_info

 from collections import OrderedDict

 from collections import defaultdict

 from Workspace.WorkspaceCommon import OrderedListDict

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 2dca9ffd5b..3b396491d0 100644
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -13,6 +13,7 @@
 

 ## Import Modules

 #

+from __future__ import absolute_import

 import string

 import collections

 import struct

@@ -22,9 +23,9 @@ from Common.BuildToolError import *
 from Common.DataType import *

 from Common.Misc import *

 from Common.StringUtils import StringToArray

-from StrGather import *

-from GenPcdDb import CreatePcdDatabaseCode

-from IdfClassObject import *

+from .StrGather import *

+from .GenPcdDb import CreatePcdDatabaseCode

+from .IdfClassObject import *

 

 ## PCD type string

 gItemTypeStringDatabase  = {

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 992de5490d..f1dc147541 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -13,6 +13,7 @@
 

 ## Import Modules

 #

+from __future__ import absolute_import

 import Common.LongFilePathOs as os

 import sys

 import string

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

 from Common.Misc import *

 from Common.StringUtils import *

-from BuildEngine import *

+from .BuildEngine import *

 import Common.GlobalData as GlobalData

 from collections import OrderedDict

 

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index c90b814e7d..2176bbefeb 100644
--- 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,

 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

+from __future__ import absolute_import

 from io import BytesIO

 from Common.Misc import *

 from Common.StringUtils import StringToArray

 from struct import pack

-from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER

-from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB

-from ValidCheckingInfoObject import GetValidationObject

+from .ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER

+from .ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB

+from .ValidCheckingInfoObject import GetValidationObject

 from Common.VariableAttributes import VariableAttributes

 import copy

 from struct import unpack

diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/Source/Python/AutoGen/IdfClassObject.py
index b656bd83e3..b227b10258 100644
--- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py
@@ -13,6 +13,7 @@
 ##

 # Import Modules

 #

+from __future__ import absolute_import

 import Common.EdkLogger as EdkLogger

 from Common.BuildToolError import *

 from Common.StringUtils import GetLineNo

@@ -21,7 +22,7 @@ from Common.LongFilePathSupport import LongFilePath
 import re

 import os

 from Common.GlobalData import gIdentifierPattern

-from UniClassObject import StripComments

+from .UniClassObject import StripComments

 

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

 

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index a702ef0dd5..361d499076 100644
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -14,10 +14,11 @@
 ##

 # Import Modules

 #

+from __future__ import absolute_import

 import re

 import Common.EdkLogger as EdkLogger

 from Common.BuildToolError import *

-from UniClassObject import *

+from .UniClassObject import *

 from io import BytesIO

 from struct import pack, unpack

 from Common.LongFilePathSupport import OpenLongFilePath as open