BaseTools: Use absolute import in Workspace

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/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 1db201f3b994bb9eae4afe5d58d079d42431f4fd..804eafa619184ca5946d4c4300127be09b04f12b 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -18,6 +18,7 @@
 # into PlatformBuildClassObject form for easier use for AutoGen.\r
 #\r
 from __future__ import print_function\r
 # into PlatformBuildClassObject form for easier use for AutoGen.\r
 #\r
 from __future__ import print_function\r

+from __future__ import absolute_import\r

 from Common.StringUtils import *\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from Common.StringUtils import *\r
 from Common.DataType import *\r
 from Common.Misc import *\r


@@ -26,11 +27,11 @@ from Common.Expression import *
 from CommonDataClass.CommonClass import SkuInfoClass\r
 from Common.TargetTxtClassObject import *\r
 from Common.ToolDefClassObject import *\r
 from CommonDataClass.CommonClass import SkuInfoClass\r
 from Common.TargetTxtClassObject import *\r
 from Common.ToolDefClassObject import *\r

-from MetaDataTable import *\r
-from MetaFileTable import *\r
-from MetaFileParser import *\r
+from .MetaDataTable import *\r
+from .MetaFileTable import *\r
+from .MetaFileParser import *\r

 \r
 \r

-from WorkspaceCommon import GetDeclaredPcd\r
+from .WorkspaceCommon import GetDeclaredPcd\r

 from Common.Misc import AnalyzeDscPcd\r
 from Common.Misc import ProcessDuplicatedInf\r
 import re\r
 from Common.Misc import AnalyzeDscPcd\r
 from Common.Misc import ProcessDuplicatedInf\r
 import re\r

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 165e03f78964bc5e8f99350d57fe9b48a34015cf..f79ffe28d804b148e4bc554e6f9c73f648283143 100644 (file)
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -12,11 +12,12 @@
 # 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

 from Common.StringUtils import *\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from types import *\r
 from Common.StringUtils import *\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from types import *\r

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

 from collections import OrderedDict\r
 \r
 from Workspace.BuildClassObject import ModuleBuildClassObject, LibraryClassObject, PcdClassObject\r
 from collections import OrderedDict\r
 \r
 from Workspace.BuildClassObject import ModuleBuildClassObject, LibraryClassObject, PcdClassObject\r

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 0aa72d8302a0be02d2b3807b740ff6850e31a200..fbfc182c8bfff2f142da3a7c7aec80b157fcfdf1 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -16,6 +16,7 @@
 # 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 time\r
 import Common.LongFilePathOs as os\r
 import re\r
 import time\r


@@ -33,8 +34,8 @@ from Common.Expression import *
 from CommonDataClass.Exceptions import *\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from collections import defaultdict\r
 from CommonDataClass.Exceptions import *\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from collections import defaultdict\r

-from MetaFileTable import MetaFileStorage\r
-from MetaFileCommentParser import CheckInfComment\r
+from .MetaFileTable import MetaFileStorage\r
+from .MetaFileCommentParser import CheckInfComment\r

 \r
 ## RegEx for finding file versions\r
 hexVersionPattern = re.compile(r'0[xX][\da-f-A-F]{5,8}')\r
 \r
 ## RegEx for finding file versions\r
 hexVersionPattern = re.compile(r'0[xX][\da-f-A-F]{5,8}')\r

diff --git a/BaseTools/Source/Python/Workspace/MetaFileTable.py b/BaseTools/Source/Python/Workspace/MetaFileTable.py
index ee1c7fffca3b36923f72ba37e5995170743a282e..e0a0b8d923517388871eed61cde6dc12997d1c5b 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileTable.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileTable.py
@@ -14,13 +14,14 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import uuid\r
 \r
 import Common.EdkLogger as EdkLogger\r
 from Common.BuildToolError import FORMAT_INVALID\r
 \r
 import uuid\r
 \r
 import Common.EdkLogger as EdkLogger\r
 from Common.BuildToolError import FORMAT_INVALID\r
 \r

-from MetaDataTable import Table, TableFile\r
-from MetaDataTable import ConvertToSqlString\r
+from .MetaDataTable import Table, TableFile\r
+from .MetaDataTable import ConvertToSqlString\r

 from CommonDataClass.DataClass import MODEL_FILE_DSC, MODEL_FILE_DEC, MODEL_FILE_INF, \\r
                                       MODEL_FILE_OTHERS\r
 from Common.DataType import *\r
 from CommonDataClass.DataClass import MODEL_FILE_DSC, MODEL_FILE_DEC, MODEL_FILE_INF, \\r
                                       MODEL_FILE_OTHERS\r
 from Common.DataType import *\r

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
index e8f159b2620450e4ec3ad0ee23efa52f46951f3b..d987bbf441eab71c149a88b5d7f4658c7d8cc52a 100644 (file)
--- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
@@ -11,9 +11,10 @@
 # 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

 from collections import OrderedDict, defaultdict\r
 from Common.DataType import SUP_MODULE_USER_DEFINED\r
 from collections import OrderedDict, defaultdict\r
 from Common.DataType import SUP_MODULE_USER_DEFINED\r

-from BuildClassObject import LibraryClassObject\r
+from .BuildClassObject import LibraryClassObject\r

 import Common.GlobalData as GlobalData\r
 from Workspace.BuildClassObject import StructurePcd\r
 from Common.BuildToolError import RESOURCE_NOT_AVAILABLE\r
 import Common.GlobalData as GlobalData\r
 from Workspace.BuildClassObject import StructurePcd\r
 from Common.BuildToolError import RESOURCE_NOT_AVAILABLE\r

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
index a40ab8fc8c882c49aa0c32041870655f337ac834..e2f373745fc0c370ee0bc82d7c1c042e7f56f7f4 100644 (file)
--- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
@@ -15,15 +15,16 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import sqlite3\r
 from Common.StringUtils import *\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from types import *\r
 \r
 import sqlite3\r
 from Common.StringUtils import *\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from types import *\r
 \r

-from MetaDataTable import *\r
-from MetaFileTable import *\r
-from MetaFileParser import *\r
+from .MetaDataTable import *\r
+from .MetaFileTable import *\r
+from .MetaFileParser import *\r

 \r
 from Workspace.DecBuildData import DecBuildData\r
 from Workspace.DscBuildData import DscBuildData\r
 \r
 from Workspace.DecBuildData import DecBuildData\r
 from Workspace.DscBuildData import DscBuildData\r