BaseTools: Use absolute import in Ecc

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/Ecc/CParser.py b/BaseTools/Source/Python/Ecc/CParser.py
index b66ac2d8d5450f857cd069f34cebec9d7161274c..0b74b53ae7a5eafeaee8d78c3a3783f5dfcee703 100644 (file)
--- a/BaseTools/Source/Python/Ecc/CParser.py
+++ b/BaseTools/Source/Python/Ecc/CParser.py
@@ -1,6 +1,7 @@
 # $ANTLR 3.0.1 C.g 2010-02-23 09:58:53\r
 \r
 from __future__ import print_function\r
 # $ANTLR 3.0.1 C.g 2010-02-23 09:58:53\r
 \r
 from __future__ import print_function\r

+from __future__ import absolute_import\r

 from antlr3 import *\r
 from antlr3.compat import set, frozenset\r
 \r
 from antlr3 import *\r
 from antlr3.compat import set, frozenset\r
 \r


@@ -23,8 +24,8 @@ from antlr3.compat import set, frozenset
 #\r
 ##\r
 \r
 #\r
 ##\r
 \r

-import CodeFragment\r
-import FileProfile\r
+from . import CodeFragment\r
+from . import FileProfile\r

 \r
 \r
 \r
 \r
 \r
 \r

diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py
index 540d9cb7edc742984ff72b69161fdd44f0366106..0b81013d77e9bcf48e197501a792c30a41e5d6d1 100644 (file)
--- a/BaseTools/Source/Python/Ecc/Check.py
+++ b/BaseTools/Source/Python/Ecc/Check.py
@@ -10,14 +10,15 @@
 # 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

 import Common.LongFilePathOs as os\r
 import re\r
 from CommonDataClass.DataClass import *\r
 import Common.DataType as DT\r
 import Common.LongFilePathOs as os\r
 import re\r
 from CommonDataClass.DataClass import *\r
 import Common.DataType as DT\r

-from EccToolError import *\r
-from MetaDataParser import ParseHeaderCommentSection\r
-import EccGlobalData\r
-import c\r
+from .EccToolError import *\r
+from .MetaDataParser import ParseHeaderCommentSection\r
+from . import EccGlobalData\r
+from . import c\r

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

diff --git a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py b/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py
index b4f421342f60d0188a3ea8e559671f3feaf7f21a..28b4e0196f5010e124c524684a3144131d928ad1 100644 (file)
--- a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py
+++ b/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py
@@ -17,18 +17,19 @@
 #\r
 \r
 from __future__ import print_function\r
 #\r
 \r
 from __future__ import print_function\r

+from __future__ import absolute_import\r

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

-from CLexer import CLexer\r
-from CParser import CParser\r
+from .CLexer import CLexer\r
+from .CParser import CParser\r

 \r
 \r

-import FileProfile\r
-from CodeFragment import Comment\r
-from CodeFragment import PP_Directive\r
-from ParserWarning import Warning\r
+from . import FileProfile\r
+from .CodeFragment import Comment\r
+from .CodeFragment import PP_Directive\r
+from .ParserWarning import Warning\r

 \r
 \r
 ##define T_CHAR_SPACE                ' '\r
 \r
 \r
 ##define T_CHAR_SPACE                ' '\r

diff --git a/BaseTools/Source/Python/Ecc/Database.py b/BaseTools/Source/Python/Ecc/Database.py
index 204117512452b4d0d2d4c1cb8fdc50b2e9cf30b1..34f49f3cba8beadac6818ca5da75f90f93c59155 100644 (file)
--- a/BaseTools/Source/Python/Ecc/Database.py
+++ b/BaseTools/Source/Python/Ecc/Database.py
@@ -14,6 +14,7 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

+from __future__ import absolute_import\r

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


@@ -26,9 +27,9 @@ from Table.TableFunction import TableFunction
 from Table.TablePcd import TablePcd\r
 from Table.TableIdentifier import TableIdentifier\r
 from Table.TableReport import TableReport\r
 from Table.TablePcd import TablePcd\r
 from Table.TableIdentifier import TableIdentifier\r
 from Table.TableReport import TableReport\r

-from MetaFileWorkspace.MetaFileTable import ModuleTable\r
-from MetaFileWorkspace.MetaFileTable import PackageTable\r
-from MetaFileWorkspace.MetaFileTable import PlatformTable\r
+from .MetaFileWorkspace.MetaFileTable import ModuleTable\r
+from .MetaFileWorkspace.MetaFileTable import PackageTable\r
+from .MetaFileWorkspace.MetaFileTable import PlatformTable\r

 from Table.TableFdf import TableFdf\r
 \r
 ##\r
 from Table.TableFdf import TableFdf\r
 \r
 ##\r

diff --git a/BaseTools/Source/Python/Ecc/Ecc.py b/BaseTools/Source/Python/Ecc/Ecc.py
index ccd563a4660e87f9da6b9a131c37f855b7134d4a..8f96bdf9778c189d845491990a505d54965c961d 100644 (file)
--- a/BaseTools/Source/Python/Ecc/Ecc.py
+++ b/BaseTools/Source/Python/Ecc/Ecc.py
@@ -14,14 +14,15 @@
 ##\r
 # Import Modules\r
 #\r
 ##\r
 # Import Modules\r
 #\r

+from __future__ import absolute_import\r

 import Common.LongFilePathOs as os, time, glob, sys\r
 import Common.EdkLogger as EdkLogger\r
 import Common.LongFilePathOs as os, time, glob, sys\r
 import Common.EdkLogger as EdkLogger\r

-import Database\r
-import EccGlobalData\r
-from MetaDataParser import *\r
+from . import Database\r
+from . import EccGlobalData\r
+from .MetaDataParser import *\r

 from optparse import OptionParser\r
 from optparse import OptionParser\r

-from Configuration import Configuration\r
-from Check import Check\r
+from .Configuration import Configuration\r
+from .Check import Check\r

 import Common.GlobalData as GlobalData\r
 \r
 from Common.StringUtils import NormPath\r
 import Common.GlobalData as GlobalData\r
 \r
 from Common.StringUtils import NormPath\r


@@ -29,14 +30,14 @@ from Common.BuildVersion import gBUILD_VERSION
 from Common import BuildToolError\r
 from Common.Misc import PathClass\r
 from Common.Misc import DirCache\r
 from Common import BuildToolError\r
 from Common.Misc import PathClass\r
 from Common.Misc import DirCache\r

-from MetaFileWorkspace.MetaFileParser import DscParser\r
-from MetaFileWorkspace.MetaFileParser import DecParser\r
-from MetaFileWorkspace.MetaFileParser import InfParser\r
-from MetaFileWorkspace.MetaFileParser import Fdf\r
-from MetaFileWorkspace.MetaFileTable import MetaFileStorage\r
-import c\r
+from .MetaFileWorkspace.MetaFileParser import DscParser\r
+from .MetaFileWorkspace.MetaFileParser import DecParser\r
+from .MetaFileWorkspace.MetaFileParser import InfParser\r
+from .MetaFileWorkspace.MetaFileParser import Fdf\r
+from .MetaFileWorkspace.MetaFileTable import MetaFileStorage\r
+from . import c\r

 import re, string\r
 import re, string\r

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

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

diff --git a/BaseTools/Source/Python/Ecc/Exception.py b/BaseTools/Source/Python/Ecc/Exception.py
index 0498a503d774484a96abc80a04c336e1675a44a9..340e0e975207d537420176a481e5740518b8adb4 100644 (file)
--- a/BaseTools/Source/Python/Ecc/Exception.py
+++ b/BaseTools/Source/Python/Ecc/Exception.py
@@ -15,7 +15,8 @@
 # Import Modules\r
 #\r
 from __future__ import print_function\r
 # Import Modules\r
 #\r
 from __future__ import print_function\r

-from Xml.XmlRoutines import *\r
+from __future__ import absolute_import\r
+from .Xml.XmlRoutines import *\r

 import Common.LongFilePathOs as os\r
 \r
 # ExceptionXml to parse Exception Node of XML file\r
 import Common.LongFilePathOs as os\r
 \r
 # ExceptionXml to parse Exception Node of XML file\r

diff --git a/BaseTools/Source/Python/Ecc/FileProfile.py b/BaseTools/Source/Python/Ecc/FileProfile.py
index a071fd020eb4c747b4fab267693acfdb1d6b1180..1d3fbf2d3b7914aa886b0434b09d3d6019741d8f 100644 (file)
--- a/BaseTools/Source/Python/Ecc/FileProfile.py
+++ b/BaseTools/Source/Python/Ecc/FileProfile.py
@@ -16,9 +16,10 @@
 # Import Modules\r
 #\r
 \r
 # Import Modules\r
 #\r
 \r

+from __future__ import absolute_import\r

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

-from ParserWarning import Warning\r
+from .ParserWarning import Warning\r

 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 CommentList = []\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 CommentList = []\r


@@ -54,5 +55,3 @@ class FileProfile :
 \r
         except IOError:\r
             raise Warning("Error when opening file %s" % FileName)\r
 \r
         except IOError:\r
             raise Warning("Error when opening file %s" % FileName)\r

-\r
-\r

diff --git a/BaseTools/Source/Python/Ecc/MetaDataParser.py b/BaseTools/Source/Python/Ecc/MetaDataParser.py
index 6060d67581be752e3cfe38ea5b54d00ec37146d5..e5744dd5cc4856b58ca152f0f631c3bc98dfe191 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaDataParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaDataParser.py
@@ -11,11 +11,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

 import Common.LongFilePathOs as os\r
 from CommonDataClass.DataClass import *\r
 import Common.LongFilePathOs as os\r
 from CommonDataClass.DataClass import *\r

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

 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r

-import EccGlobalData\r
+from . import EccGlobalData\r

 import re\r
 ## Get the inlcude path list for a source file\r
 #\r
 import re\r
 ## Get the inlcude path list for a source file\r
 #\r

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index 111a25ed92603fd988ef63895d786fda3d93ad81..51669815b55f94d9a17aa160a84394ece4e170b4 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.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 re\r
 import time\r
 import Common.LongFilePathOs as os\r
 import re\r
 import time\r


@@ -31,7 +32,7 @@ from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClas
 from Common.Expression import *\r
 from CommonDataClass.Exceptions import *\r
 \r
 from Common.Expression import *\r
 from CommonDataClass.Exceptions import *\r
 \r

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

 from GenFds.FdfParser import FdfParser\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.LongFilePathSupport import CodecOpenLongFilePath\r
 from GenFds.FdfParser import FdfParser\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.LongFilePathSupport import CodecOpenLongFilePath\r

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileTable.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileTable.py
index ad3cf36a1cbd40364909232f46252d292f5d5a26..7e0afd5d70d7314bece3d124580fcd1975efca32 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileTable.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/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
 import EccGlobalData\r
 \r
 import uuid\r
 \r
 import Common.EdkLogger as EdkLogger\r
 import EccGlobalData\r
 \r

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

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

diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py
index 12dbf664ba9bda6590a05fbf6063d7e05adad93a..5616c108533e47b51cdd062dfed64ea8df90acba 100644 (file)
--- a/BaseTools/Source/Python/Ecc/c.py
+++ b/BaseTools/Source/Python/Ecc/c.py
@@ -12,18 +12,19 @@
 #\r
 \r
 from __future__ import print_function\r
 #\r
 \r
 from __future__ import print_function\r

+from __future__ import absolute_import\r

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

-import CodeFragmentCollector\r
-import FileProfile\r
+from . import CodeFragmentCollector\r
+from . import FileProfile\r

 from CommonDataClass import DataClass\r
 from CommonDataClass import DataClass\r

-import Database\r
+from . import Database\r

 from Common import EdkLogger\r
 from Common import EdkLogger\r

-from EccToolError import *\r
-import EccGlobalData\r
-import MetaDataParser\r
+from .EccToolError import *\r
+from . import EccGlobalData\r
+from . import MetaDataParser\r

 \r
 IncludeFileListDict = {}\r
 AllIncludeFileListDict = {}\r
 \r
 IncludeFileListDict = {}\r
 AllIncludeFileListDict = {}\r