Skip to content

Commit

Permalink
BaseTools: Use absolute import in Workspace
Browse files Browse the repository at this point in the history
Based on "futurize -f libfuturize.fixes.fix_absolute_import

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Yonghong Zhu <[email protected]>
Cc: Liming Gao <[email protected]>
Signed-off-by: Gary Lin <[email protected]>
Reviewed-by: Jaben Carsey <[email protected]>
  • Loading branch information
lcp authored and Yonghong Zhu committed Jul 16, 2018
1 parent ac10741 commit 1100bc5
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
9 changes: 5 additions & 4 deletions BaseTools/Source/Python/Workspace/DscBuildData.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
# into PlatformBuildClassObject form for easier use for AutoGen.
#
from __future__ import print_function
from __future__ import absolute_import
from Common.StringUtils import *
from Common.DataType import *
from Common.Misc import *
Expand All @@ -26,11 +27,11 @@
from CommonDataClass.CommonClass import SkuInfoClass
from Common.TargetTxtClassObject import *
from Common.ToolDefClassObject import *
from MetaDataTable import *
from MetaFileTable import *
from MetaFileParser import *
from .MetaDataTable import *
from .MetaFileTable import *
from .MetaFileParser import *

from WorkspaceCommon import GetDeclaredPcd
from .WorkspaceCommon import GetDeclaredPcd
from Common.Misc import AnalyzeDscPcd
from Common.Misc import ProcessDuplicatedInf
import re
Expand Down
3 changes: 2 additions & 1 deletion BaseTools/Source/Python/Workspace/InfBuildData.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#

from __future__ import absolute_import
from Common.StringUtils import *
from Common.DataType import *
from Common.Misc import *
from types import *
from MetaFileParser import *
from .MetaFileParser import *
from collections import OrderedDict

from Workspace.BuildClassObject import ModuleBuildClassObject, LibraryClassObject, PcdClassObject
Expand Down
5 changes: 3 additions & 2 deletions BaseTools/Source/Python/Workspace/MetaFileParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# Import Modules
#
from __future__ import print_function
from __future__ import absolute_import
import Common.LongFilePathOs as os
import re
import time
Expand All @@ -33,8 +34,8 @@
from CommonDataClass.Exceptions import *
from Common.LongFilePathSupport import OpenLongFilePath as open
from collections import defaultdict
from MetaFileTable import MetaFileStorage
from MetaFileCommentParser import CheckInfComment
from .MetaFileTable import MetaFileStorage
from .MetaFileCommentParser import CheckInfComment

## RegEx for finding file versions
hexVersionPattern = re.compile(r'0[xX][\da-f-A-F]{5,8}')
Expand Down
5 changes: 3 additions & 2 deletions BaseTools/Source/Python/Workspace/MetaFileTable.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@
##
# Import Modules
#
from __future__ import absolute_import
import uuid

import Common.EdkLogger as EdkLogger
from Common.BuildToolError import FORMAT_INVALID

from MetaDataTable import Table, TableFile
from MetaDataTable import ConvertToSqlString
from .MetaDataTable import Table, TableFile
from .MetaDataTable import ConvertToSqlString
from CommonDataClass.DataClass import MODEL_FILE_DSC, MODEL_FILE_DEC, MODEL_FILE_INF, \
MODEL_FILE_OTHERS
from Common.DataType import *
Expand Down
3 changes: 2 additions & 1 deletion BaseTools/Source/Python/Workspace/WorkspaceCommon.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#

from __future__ import absolute_import
from collections import OrderedDict, defaultdict
from Common.DataType import SUP_MODULE_USER_DEFINED
from BuildClassObject import LibraryClassObject
from .BuildClassObject import LibraryClassObject
import Common.GlobalData as GlobalData
from Workspace.BuildClassObject import StructurePcd
from Common.BuildToolError import RESOURCE_NOT_AVAILABLE
Expand Down
7 changes: 4 additions & 3 deletions BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
##
# Import Modules
#
from __future__ import absolute_import
import sqlite3
from Common.StringUtils import *
from Common.DataType import *
from Common.Misc import *
from types import *

from MetaDataTable import *
from MetaFileTable import *
from MetaFileParser import *
from .MetaDataTable import *
from .MetaFileTable import *
from .MetaFileParser import *

from Workspace.DecBuildData import DecBuildData
from Workspace.DscBuildData import DscBuildData
Expand Down

0 comments on commit 1100bc5

Please sign in to comment.