BaseTools: Use absolute import in Common

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/Common/Database.py b/BaseTools/Source/Python/Common/Database.py
index 6abfa1f15e35ef3ea1e0c6347959ec98d025464b..1c543aeb41b15efeead4a0f023856e97ad175d85 100644 (file)
--- a/BaseTools/Source/Python/Common/Database.py
+++ b/BaseTools/Source/Python/Common/Database.py
@@ -14,13 +14,14 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import sqlite3\r
 import Common.LongFilePathOs as os\r
 \r
 import sqlite3\r
 import Common.LongFilePathOs as os\r
 \r

-import EdkLogger as EdkLogger\r
+from . import EdkLogger as EdkLogger\r

 from CommonDataClass.DataClass import *\r
 from CommonDataClass.DataClass import *\r

-from StringUtils import *\r
-from DataType import *\r
+from .StringUtils import *\r
+from .DataType import *\r

 \r
 from Table.TableDataModel import TableDataModel\r
 from Table.TableFile import TableFile\r
 \r
 from Table.TableDataModel import TableDataModel\r
 from Table.TableFile import TableFile\r


@@ -117,4 +118,3 @@ if __name__ == '__main__':
     Db.QueryTable(Db.TblFile)\r
     Db.QueryTable(Db.TblDsc)\r
     Db.Close()\r
     Db.QueryTable(Db.TblFile)\r
     Db.QueryTable(Db.TblDsc)\r
     Db.Close()\r

-\r

diff --git a/BaseTools/Source/Python/Common/EdkLogger.py b/BaseTools/Source/Python/Common/EdkLogger.py
index 3f462df49ada100eefa586161cd54f3d836c9773..19749066eceec855ac7e4cfa6d33830000b6c59a 100644 (file)
--- a/BaseTools/Source/Python/Common/EdkLogger.py
+++ b/BaseTools/Source/Python/Common/EdkLogger.py
@@ -12,9 +12,10 @@
 #\r
 \r
 ## Import modules\r
 #\r
 \r
 ## Import modules\r

+from __future__ import absolute_import\r

 import Common.LongFilePathOs as os, sys, logging\r
 import traceback\r
 import Common.LongFilePathOs as os, sys, logging\r
 import traceback\r

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

 \r
 ## Log level constants\r
 DEBUG_0 = 1\r
 \r
 ## Log level constants\r
 DEBUG_0 = 1\r

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 51e8d2174a8ff2352a342835fb2a140c6349f571..ccc736846afa94cd70dbfd0237acd7e3b6e35d91 100644 (file)
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -13,10 +13,11 @@
 ## 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

 from Common.GlobalData import *\r
 from CommonDataClass.Exceptions import BadExpression\r
 from CommonDataClass.Exceptions import WrnExpression\r
 from Common.GlobalData import *\r
 from CommonDataClass.Exceptions import BadExpression\r
 from CommonDataClass.Exceptions import WrnExpression\r

-from Misc import GuidStringToGuidStructureString, ParseFieldValue, IsFieldValueAnArray\r
+from .Misc import GuidStringToGuidStructureString, ParseFieldValue, IsFieldValueAnArray\r

 import Common.EdkLogger as EdkLogger\r
 import copy\r
 from Common.DataType import *\r
 import Common.EdkLogger as EdkLogger\r
 import copy\r
 from Common.DataType import *\r

diff --git a/BaseTools/Source/Python/Common/LongFilePathOs.py b/BaseTools/Source/Python/Common/LongFilePathOs.py
index 4939a8bc733c5f6718650e0f7927ab11ef47b914..53528546b7822df9dbbc39eb409d69d2b75476a6 100644 (file)
--- a/BaseTools/Source/Python/Common/LongFilePathOs.py
+++ b/BaseTools/Source/Python/Common/LongFilePathOs.py
@@ -11,8 +11,9 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r

+from __future__ import absolute_import\r

 import os\r
 import os\r

-import LongFilePathOsPath\r
+from . import LongFilePathOsPath\r

 from Common.LongFilePathSupport import LongFilePath\r
 from Common.LongFilePathSupport import UniToStr\r
 import time\r
 from Common.LongFilePathSupport import LongFilePath\r
 from Common.LongFilePathSupport import UniToStr\r
 import time\r

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index b56ddd5324711d5e8412be5a0f391cf0256fc555..79d1ff28f50bb4a5693389269a08eaccd5f2a112 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -14,6 +14,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


@@ -30,10 +31,10 @@ from UserList import UserList
 \r
 from Common import EdkLogger as EdkLogger\r
 from Common import GlobalData as GlobalData\r
 \r
 from Common import EdkLogger as EdkLogger\r
 from Common import GlobalData as GlobalData\r

-from DataType import *\r
-from BuildToolError import *\r
+from .DataType import *\r
+from .BuildToolError import *\r

 from CommonDataClass.DataClass import *\r
 from CommonDataClass.DataClass import *\r

-from Parsing import GetSplitValueList\r
+from .Parsing import GetSplitValueList\r

 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 import uuid\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 import uuid\r


@@ -474,7 +475,7 @@ def SaveFileOnChange(File, Content, IsBinaryFile=True):
     try:\r
         if GlobalData.gIsWindows:\r
             try:\r
     try:\r
         if GlobalData.gIsWindows:\r
             try:\r

-                from PyUtility import SaveFileToDisk\r
+                from .PyUtility import SaveFileToDisk\r

                 if not SaveFileToDisk(File, Content):\r
                     EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData=File)\r
             except:\r
                 if not SaveFileToDisk(File, Content):\r
                     EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData=File)\r
             except:\r

diff --git a/BaseTools/Source/Python/Common/Parsing.py b/BaseTools/Source/Python/Common/Parsing.py
index 527852a50c09ed57ee3c96e6e459ff6ac8923102..889251b69935dd779ef5daf73cf64659b9752a22 100644 (file)
--- a/BaseTools/Source/Python/Common/Parsing.py
+++ b/BaseTools/Source/Python/Common/Parsing.py
@@ -14,9 +14,10 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

-from StringUtils import *\r
+from __future__ import absolute_import\r
+from .StringUtils import *\r

 from CommonDataClass.DataClass import *\r
 from CommonDataClass.DataClass import *\r

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

 \r
 ## ParseDefineMacro\r
 #\r
 \r
 ## ParseDefineMacro\r
 #\r

diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Source/Python/Common/StringUtils.py
index 723faac0f9f3da827b68e5703b272f9c297d4559..da2949dbadef0848596e7da12db48ed5a84cd4f7 100644 (file)
--- a/BaseTools/Source/Python/Common/StringUtils.py
+++ b/BaseTools/Source/Python/Common/StringUtils.py
@@ -14,14 +14,15 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import re\r
 import re\r

-import DataType\r
+from . import DataType\r

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

-import EdkLogger as EdkLogger\r
+from . import EdkLogger as EdkLogger\r

 \r
 \r

-import GlobalData\r
-from BuildToolError import *\r
+from . import GlobalData\r
+from .BuildToolError import *\r

 from CommonDataClass.Exceptions import *\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 from CommonDataClass.Exceptions import *\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r

diff --git a/BaseTools/Source/Python/Common/TargetTxtClassObject.py b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
index 8ba8dd31a8c598f82f201bc402a52247ccc39187..55a2f564821e11f6e10c1329e4a866c0ed457289 100644 (file)
--- a/BaseTools/Source/Python/Common/TargetTxtClassObject.py
+++ b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
@@ -15,11 +15,12 @@
 # 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 Common.LongFilePathOs as os\r

-import EdkLogger\r
-import DataType\r
-from BuildToolError import *\r
-import GlobalData\r
+from . import EdkLogger\r
+from . import DataType\r
+from .BuildToolError import *\r
+from . import GlobalData\r

 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 gDefaultTargetTxtFile = "target.txt"\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 gDefaultTargetTxtFile = "target.txt"\r

diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseTools/Source/Python/Common/ToolDefClassObject.py
index 7cc7e22839e159ce86b6a46159bd021cb628cab2..05a1ddfbcc89dcd056938bec7779f6af636a2c1f 100644 (file)
--- a/BaseTools/Source/Python/Common/ToolDefClassObject.py
+++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py
@@ -14,19 +14,20 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import Common.LongFilePathOs as os\r
 import re\r
 import Common.LongFilePathOs as os\r
 import re\r

-import EdkLogger\r
+from . import EdkLogger\r

 \r
 \r

-from BuildToolError import *\r
-from TargetTxtClassObject import *\r
+from .BuildToolError import *\r
+from .TargetTxtClassObject import *\r

 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.Misc import PathClass\r
 from Common.StringUtils import NormPath\r
 import Common.GlobalData as GlobalData\r
 from Common import GlobalData\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.Misc import PathClass\r
 from Common.StringUtils import NormPath\r
 import Common.GlobalData as GlobalData\r
 from Common import GlobalData\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r

-from DataType import TAB_TOD_DEFINES_TARGET, TAB_TOD_DEFINES_TOOL_CHAIN_TAG,\\r
+from .DataType import TAB_TOD_DEFINES_TARGET, TAB_TOD_DEFINES_TOOL_CHAIN_TAG,\\r

                      TAB_TOD_DEFINES_TARGET_ARCH, TAB_TOD_DEFINES_COMMAND_TYPE\\r
                      , TAB_TOD_DEFINES_FAMILY, TAB_TOD_DEFINES_BUILDRULEFAMILY\r
 \r
                      TAB_TOD_DEFINES_TARGET_ARCH, TAB_TOD_DEFINES_COMMAND_TYPE\\r
                      , TAB_TOD_DEFINES_FAMILY, TAB_TOD_DEFINES_BUILDRULEFAMILY\r
 \r