BaseTools: Remove the "from __future__ import" items

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 7c0bb47f777577a3c134f1b88844127274a0dceb..b0aa4838e9617427f87103ea190f630329f1c07b 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -15,8 +15,6 @@
 \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 os.path as path\r

diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py
index ac7a6687552cde3366a6c2f3fb8b6cafea649666..86a3c09ad50d2b5b0f073a898c7b36b7958028f0 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/BuildEngine.py
+++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import print_function\r
 import Common.LongFilePathOs as os\r
 import re\r
 import copy\r

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 09626d0b96102d9799bab76e6c498969bb3d96d0..c189269d4d1e6376126997783f07afe53f3d51a6 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -13,7 +13,6 @@
 \r
 ## Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import string\r
 import collections\r
 import struct\r

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index b4377eef17d7e3e3004b8f47fbb143eb0aaea75c..bf84e6c63fbc6564a0d2688c638c62f4a77fd56d 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -13,7 +13,6 @@
 \r
 ## Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 import sys\r
 import string\r

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index 876fcf1efb8a269c0b3f769355da3a8858c81120..fff717d579257367712b76429a09ab90dd0fb117 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -10,7 +10,6 @@
 # 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
 from io import BytesIO\r
 from Common.Misc import *\r
 from Common.StringUtils import StringToArray\r

diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/Source/Python/AutoGen/IdfClassObject.py
index b227b10258da8b73bcc7414f68e8aee0b5e30a1c..f96a16ababe8736447a7ffbdc03d1a0279a3aacf 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py
@@ -13,7 +13,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 from Common.BuildToolError import *\r
 from Common.StringUtils import GetLineNo\r

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index 361d499076850042adfd03f6587457a1876700b4..3f384db1df11ab08f93ca52f3f58a476a928f079 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import re\r
 import Common.EdkLogger as EdkLogger\r
 from Common.BuildToolError import *\r

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 384f31b165de08222f36e8f5330549ec7182da7e..b435ffa569b740ce5ca534bfc5876515e6f1d379 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -16,7 +16,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import print_function\r
 import Common.LongFilePathOs as os, codecs, re\r
 import distutils.util\r
 import Common.EdkLogger as EdkLogger\r

diff --git a/BaseTools/Source/Python/BPDG/BPDG.py b/BaseTools/Source/Python/BPDG/BPDG.py
index 2ec1516c0a08da6b52ae6d0b4aafd91e0d82811d..15d4261677ef00d56cf808d07218d141011db710 100644 (file)
--- a/BaseTools/Source/Python/BPDG/BPDG.py
+++ b/BaseTools/Source/Python/BPDG/BPDG.py
@@ -20,8 +20,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import print_function\r
-from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 import sys\r
 import encodings.ascii\r

diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/Source/Python/BPDG/GenVpd.py
index d7852d29eed09df7b016ab7fadc8aff991973146..5dcd422f8bf594ef2c6666a5dbbbc20fe0f6a37c 100644 (file)
--- a/BaseTools/Source/Python/BPDG/GenVpd.py
+++ b/BaseTools/Source/Python/BPDG/GenVpd.py
@@ -13,7 +13,6 @@
 #  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 io import BytesIO\r
 from . import StringTable as st\r

diff --git a/BaseTools/Source/Python/Common/Database.py b/BaseTools/Source/Python/Common/Database.py
index 1c543aeb41b15efeead4a0f023856e97ad175d85..0888edf37ad836e970decaab6bad41f970de3780 100644 (file)
--- a/BaseTools/Source/Python/Common/Database.py
+++ b/BaseTools/Source/Python/Common/Database.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import sqlite3\r
 import Common.LongFilePathOs as os\r
 \r

diff --git a/BaseTools/Source/Python/Common/EdkLogger.py b/BaseTools/Source/Python/Common/EdkLogger.py
index af7707482ccb7d897bb8a7d3b18094196fb45aa3..d70b24e6427f3220b83ba13c98f5d54a103f180e 100644 (file)
--- a/BaseTools/Source/Python/Common/EdkLogger.py
+++ b/BaseTools/Source/Python/Common/EdkLogger.py
@@ -12,7 +12,6 @@
 #\r
 \r
 ## Import modules\r
-from __future__ import absolute_import\r
 import Common.LongFilePathOs as os, sys, logging\r
 import traceback\r
 from  .BuildToolError import *\r

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index ff9271031b0e3351e441fdd4ff195212e1b64dd2..78a8a0bb0f71a41765e3b8d569eb4fb6f8b02e6d 100644 (file)
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -12,8 +12,6 @@
 \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

diff --git a/BaseTools/Source/Python/Common/LongFilePathOs.py b/BaseTools/Source/Python/Common/LongFilePathOs.py
index 53528546b7822df9dbbc39eb409d69d2b75476a6..5e409e20308bdffd853b0e96f58ea88ee7796098 100644 (file)
--- a/BaseTools/Source/Python/Common/LongFilePathOs.py
+++ b/BaseTools/Source/Python/Common/LongFilePathOs.py
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
-from __future__ import absolute_import\r
 import os\r
 from . import LongFilePathOsPath\r
 from Common.LongFilePathSupport import LongFilePath\r

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 0efd8b05a87798a093759be5e0d6f251dfcc0cbb..5e7b163939e9262f8764dcde0bd8f3f86fae4b52 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 import sys\r
 import string\r

diff --git a/BaseTools/Source/Python/Common/Parsing.py b/BaseTools/Source/Python/Common/Parsing.py
index 889251b69935dd779ef5daf73cf64659b9752a22..ad90afab800224d1b09862254836a995a137bb13 100644 (file)
--- a/BaseTools/Source/Python/Common/Parsing.py
+++ b/BaseTools/Source/Python/Common/Parsing.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from .StringUtils import *\r
 from CommonDataClass.DataClass import *\r
 from .DataType import *\r

diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index 407dc06ccf0b598b03a9a25bf6f80114364a13d5..5449d2d1af38ea54d5b7ce07092e7fc0a4d618a3 100644 (file)
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -12,7 +12,6 @@
 \r
 # # Import Modules\r
 #\r
-from __future__ import print_function\r
 from Common.GlobalData import *\r
 from CommonDataClass.Exceptions import BadExpression\r
 from CommonDataClass.Exceptions import WrnExpression\r

diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Source/Python/Common/StringUtils.py
index d5afde7a95a5c1ad9edf317fc195dbd387bf03de..005dbd09bb146d1ebde1954c0f056f571eee68fc 100644 (file)
--- a/BaseTools/Source/Python/Common/StringUtils.py
+++ b/BaseTools/Source/Python/Common/StringUtils.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import re\r
 from . import DataType\r
 import Common.LongFilePathOs as os\r

diff --git a/BaseTools/Source/Python/Common/TargetTxtClassObject.py b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
index 55a2f564821e11f6e10c1329e4a866c0ed457289..35b170e086287c68b21e39c62d9e4b45fcdf95a6 100644 (file)
--- a/BaseTools/Source/Python/Common/TargetTxtClassObject.py
+++ b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
@@ -14,8 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import print_function\r
-from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 from . import EdkLogger\r
 from . import DataType\r

diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseTools/Source/Python/Common/ToolDefClassObject.py
index 05a1ddfbcc89dcd056938bec7779f6af636a2c1f..5a961c3d944aa096848652a98d7b3de159bbebfb 100644 (file)
--- a/BaseTools/Source/Python/Common/ToolDefClassObject.py
+++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 import re\r
 from . import EdkLogger\r

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 0485bf482ec0509f1af450e1b394137b80241282..bae184f0407127bfc4f47f03f21a96254985e8f3 100644 (file)
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -15,7 +15,6 @@
 # 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 print_function\r
 import Common.LongFilePathOs as os\r
 import re\r
 import Common.EdkLogger as EdkLogger\r

diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/Source/Python/GenFds/AprioriSection.py
index 7196f7f2c753c53eef0e0962b1428d3093cecfb4..aaa919d7a8b5ae1a02517c1fd60a28072234d3e7 100644 (file)
--- a/BaseTools/Source/Python/GenFds/AprioriSection.py
+++ b/BaseTools/Source/Python/GenFds/AprioriSection.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from struct import *\r
 import Common.LongFilePathOs as os\r
 from io import BytesIO\r

diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/Python/GenFds/Capsule.py
index baa6e1dfa2ab8bc31f61aaaca0b8c0bc501ef82f..238cb4e9185a12f05a44206edbdcfbe2a7a9023c 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Capsule.py
+++ b/BaseTools/Source/Python/GenFds/Capsule.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
 from .GenFdsGlobalVariable import FindExtendTool\r
 from CommonDataClass.FdfClass import CapsuleClassObject\r

diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Source/Python/GenFds/CapsuleData.py
index 0caba8983d2e1b35f5d937910100a5e245472339..1a592189b3d7c8e6540222706f7c37c4ebebcff0 100644 (file)
--- a/BaseTools/Source/Python/GenFds/CapsuleData.py
+++ b/BaseTools/Source/Python/GenFds/CapsuleData.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Ffs\r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
 from io import BytesIO\r

diff --git a/BaseTools/Source/Python/GenFds/CompressSection.py b/BaseTools/Source/Python/GenFds/CompressSection.py
index aaaabf84dca8268dea68246aefcc2e1a3692b8d0..65f678227583eca8e6825c634a3a522a0910489f 100644 (file)
--- a/BaseTools/Source/Python/GenFds/CompressSection.py
+++ b/BaseTools/Source/Python/GenFds/CompressSection.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from .Ffs import Ffs\r
 from . import Section\r
 import subprocess\r

diff --git a/BaseTools/Source/Python/GenFds/DataSection.py b/BaseTools/Source/Python/GenFds/DataSection.py
index a6387b07c582b15fb06496276dca863b1b8d44ea..182ea4f3da80bd3c1051f3bb4e50dbe39cdcfa71 100644 (file)
--- a/BaseTools/Source/Python/GenFds/DataSection.py
+++ b/BaseTools/Source/Python/GenFds/DataSection.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Section\r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
 import subprocess\r

diff --git a/BaseTools/Source/Python/GenFds/DepexSection.py b/BaseTools/Source/Python/GenFds/DepexSection.py
index b2d123bfc04578883016688bf00ded6e8faf4280..1868f0aab7f554c92ab3353066947a660c5f2273 100644 (file)
--- a/BaseTools/Source/Python/GenFds/DepexSection.py
+++ b/BaseTools/Source/Python/GenFds/DepexSection.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Section\r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
 import subprocess\r

diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Source/Python/GenFds/EfiSection.py
index 623b77d27427a83d42c75842a507718fc115da3f..fa2148ec7b2871d93603038d5fc63a482bf5e6ab 100644 (file)
--- a/BaseTools/Source/Python/GenFds/EfiSection.py
+++ b/BaseTools/Source/Python/GenFds/EfiSection.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from struct import *\r
 from . import Section\r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r

diff --git a/BaseTools/Source/Python/GenFds/Fd.py b/BaseTools/Source/Python/GenFds/Fd.py
index bfae1217984a1a50825608cd8ecea6d8b51f8773..bb58928afaceb998c69c124b16fbfb79e65af1a4 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fd.py
+++ b/BaseTools/Source/Python/GenFds/Fd.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Region\r
 from . import Fv\r
 import Common.LongFilePathOs as os\r

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 63687e98bb313ed50a9cdfe9b5a2c14298d5454b..d18b0a332830afda467b1dab4e377c73b3a4f98d 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -16,8 +16,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import print_function\r
-from __future__ import absolute_import\r
 import re\r
 \r
 from . import Fd\r

diff --git a/BaseTools/Source/Python/GenFds/FfsFileStatement.py b/BaseTools/Source/Python/GenFds/FfsFileStatement.py
index 4c35aac76a000e016d4386a2b5b995103c4006ed..558a3f75c03755df2e8df41bafe085d23efc3f9f 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FfsFileStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsFileStatement.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Ffs\r
 from . import Rule\r
 import Common.LongFilePathOs as os\r

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index 6149bc81b4ef53bbe70e0c2bcd8e18cbff1ac542..43b9c90b776a28fb9103f5494331f71bbf6459f5 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -16,7 +16,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Rule\r
 import Common.LongFilePathOs as os\r
 from io import BytesIO\r

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 0d005ebf5bb630fa9e5a6124be2b690da4dd1e54..2bca6d7341815256b1c4bed15db4bbb26cd38a55 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import\r
 ## @file\r
 # process FV generation\r
 #\r

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index 04556fc870998ce1422fcd0638ffc5ef77b7485b..3278a8befa5edbba8df26256836e5496061e5e4a 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Section\r
 from io import BytesIO\r
 from .Ffs import Ffs\r

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 9dec9c5eb57d3885ec36401d833b9838ffcddaa6..5c22755bb70a9e0bfe87c0c3e67f921b298ef8f9 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -15,8 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import print_function\r
-from __future__ import absolute_import\r
 from optparse import OptionParser\r
 import sys\r
 import Common.LongFilePathOs as os\r

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 14578a92a9b19c6fdc6655fa42034f87723f8811..1f3ca107798eee38702ae542135280e0b7e86366 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import print_function\r
 import Common.LongFilePathOs as os\r
 import sys\r
 import subprocess\r

diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Source/Python/GenFds/GuidSection.py
index fd660737f421f46d961bf5bc2921acff11ac8af8..1f0c87dd7e50feef85d3182551bccd33f5cb7b54 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GuidSection.py
+++ b/BaseTools/Source/Python/GenFds/GuidSection.py
@@ -16,7 +16,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Section\r
 import subprocess\r
 from .Ffs import Ffs\r

diff --git a/BaseTools/Source/Python/GenFds/OptRomFileStatement.py b/BaseTools/Source/Python/GenFds/OptRomFileStatement.py
index e56174ec3c86fc22aa4662893a80a5ee1f1b17f0..5d0325015848936ee773967f6640ca5934747274 100644 (file)
--- a/BaseTools/Source/Python/GenFds/OptRomFileStatement.py
+++ b/BaseTools/Source/Python/GenFds/OptRomFileStatement.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 \r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r

diff --git a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
index e416b838d1e45b354bbdd0a60f354d0ed96a7dd4..c5d106fd85ee452d641f12ce7b45e85766049a69 100644 (file)
--- a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import RuleSimpleFile\r
 from . import RuleComplexFile\r
 from . import Section\r

diff --git a/BaseTools/Source/Python/GenFds/OptionRom.py b/BaseTools/Source/Python/GenFds/OptionRom.py
index bb7071fa7fca36df97b8eaca0ac8d915620193f4..ebe30fec5864f8396d8672b2834c9f27d013f7fb 100644 (file)
--- a/BaseTools/Source/Python/GenFds/OptionRom.py
+++ b/BaseTools/Source/Python/GenFds/OptionRom.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.LongFilePathOs as os\r
 import subprocess\r
 \r

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index 5242b74c9e707954e9535107710fac384694fe7d..457861fa570ea1be1f06fe3aef2191768e2534b5 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from struct import *\r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
 from io import BytesIO\r

diff --git a/BaseTools/Source/Python/GenFds/RuleComplexFile.py b/BaseTools/Source/Python/GenFds/RuleComplexFile.py
index c357fedbd3beecd513a60805cd6bf742050c670d..066156a2f671554c822f54f8e757be4f699cdf53 100644 (file)
--- a/BaseTools/Source/Python/GenFds/RuleComplexFile.py
+++ b/BaseTools/Source/Python/GenFds/RuleComplexFile.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Rule\r
 from  CommonDataClass.FdfClass import RuleComplexFileClassObject\r
 \r

diff --git a/BaseTools/Source/Python/GenFds/RuleSimpleFile.py b/BaseTools/Source/Python/GenFds/RuleSimpleFile.py
index 7aa184e7d8bbda663c09528842fa5c024f6370ba..4e6b9231a2d078fc7f46cf85302709f4ee9554bd 100644 (file)
--- a/BaseTools/Source/Python/GenFds/RuleSimpleFile.py
+++ b/BaseTools/Source/Python/GenFds/RuleSimpleFile.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Rule\r
 from CommonDataClass.FdfClass import RuleSimpleFileClassObject\r
 \r

diff --git a/BaseTools/Source/Python/GenFds/Section.py b/BaseTools/Source/Python/GenFds/Section.py
index 19a70009dccea4cd157017137aea3a1a9dcc75a5..61dc32762bc6fd64ceda583a45f507fd6152d6ef 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Section.py
+++ b/BaseTools/Source/Python/GenFds/Section.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from CommonDataClass.FdfClass import SectionClassObject\r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
 import Common.LongFilePathOs as os, glob\r

diff --git a/BaseTools/Source/Python/GenFds/UiSection.py b/BaseTools/Source/Python/GenFds/UiSection.py
index 24f2f3ca938dee1b8506840a3f5ad0639b38460d..ba0534fa49026907b87bfa0631930d1526dccf50 100644 (file)
--- a/BaseTools/Source/Python/GenFds/UiSection.py
+++ b/BaseTools/Source/Python/GenFds/UiSection.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from . import Section\r
 from .Ffs import Ffs\r
 import subprocess\r

diff --git a/BaseTools/Source/Python/GenFds/VerSection.py b/BaseTools/Source/Python/GenFds/VerSection.py
index db71fe9653d40777466771b519655a9a18abb95e..eb3e93075525ce8e6cec8aad0a6817394bc2e923 100644 (file)
--- a/BaseTools/Source/Python/GenFds/VerSection.py
+++ b/BaseTools/Source/Python/GenFds/VerSection.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from .Ffs import Ffs\r
 from . import Section\r
 import Common.LongFilePathOs as os\r

diff --git a/BaseTools/Source/Python/GenFds/Vtf.py b/BaseTools/Source/Python/GenFds/Vtf.py
index 5cb2d4acfb1cc1eed456618768fb3614bffee5fb..6a8294afb0548894d8de96b66d51ace6dcbd97e0 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Vtf.py
+++ b/BaseTools/Source/Python/GenFds/Vtf.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
 import Common.LongFilePathOs as os\r
 from CommonDataClass.FdfClass import VtfClassObject\r

diff --git a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
index 1be0a28177ff8c39f001629c93d8a84c883d897f..3b54d19887c5e110859bb8f7c7a94aaf6a36989b 100644 (file)
--- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
+++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
@@ -17,7 +17,6 @@
 #\r
 \r
 #======================================  External Libraries ========================================\r
-from __future__ import print_function\r
 import optparse\r
 import Common.LongFilePathOs as os\r
 import re\r

diff --git a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
index a44781f2e8399fee455244cd1d45147abb8803bd..47677cc28ede0737c48f07c7b5ee3759975cd317 100644 (file)
--- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
+++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
@@ -19,7 +19,6 @@
 '''\r
 Pkcs7Sign\r
 '''\r
-from __future__ import print_function\r
 \r
 import os\r
 import sys\r

diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
index a34dac423b8c1eeb5698917e3e0b9422c12ea9dc..1be360f7430f389b2b0b939f26598b07e4ed22a3 100644 (file)
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
@@ -22,7 +22,6 @@
 '''\r
 Rsa2048Sha256GenerateKeys\r
 '''\r
-from __future__ import print_function\r
 \r
 import os\r
 import sys\r

diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
index 3fd7eefd6af5555c7d8678fa095f9d52f6177655..50a442dd4ae85ccaa9368653144b87c1bb81b588 100644 (file)
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py
@@ -17,7 +17,6 @@
 '''\r
 Rsa2048Sha256Sign\r
 '''\r
-from __future__ import print_function\r
 \r
 import os\r
 import sys\r

diff --git a/BaseTools/Source/Python/Table/TableDataModel.py b/BaseTools/Source/Python/Table/TableDataModel.py
index b01c3ecf6aea0b64975bbf3f2c340b5fa8319c56..9f3e008bc65b2c223279d54bba11104d49cee722 100644 (file)
--- a/BaseTools/Source/Python/Table/TableDataModel.py
+++ b/BaseTools/Source/Python/Table/TableDataModel.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 import CommonDataClass.DataClass as DataClass\r
 from Table.Table import Table\r

diff --git a/BaseTools/Source/Python/Table/TableDec.py b/BaseTools/Source/Python/Table/TableDec.py
index 1d887dc1e195c97f2592298e008466e155659d66..532c15971aa830ad1bcba658ac380e5256872691 100644 (file)
--- a/BaseTools/Source/Python/Table/TableDec.py
+++ b/BaseTools/Source/Python/Table/TableDec.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 import CommonDataClass.DataClass as DataClass\r
 from Table.Table import Table\r

diff --git a/BaseTools/Source/Python/Table/TableDsc.py b/BaseTools/Source/Python/Table/TableDsc.py
index 0a45f7f5b617052cf09f5c4c84061d02462a0c29..886b752aa823b3c77abf46974e61fcb7a3192de7 100644 (file)
--- a/BaseTools/Source/Python/Table/TableDsc.py
+++ b/BaseTools/Source/Python/Table/TableDsc.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import\r
 ## @file\r
 # This file is used to create/update/query/erase table for dsc datas\r
 #\r

diff --git a/BaseTools/Source/Python/Table/TableEotReport.py b/BaseTools/Source/Python/Table/TableEotReport.py
index 6f2fb37189aa7be4785612aa5d55f9bfb0f5cef9..2567411dd7dd2d29c900af0721173d1dba1b3369 100644 (file)
--- a/BaseTools/Source/Python/Table/TableEotReport.py
+++ b/BaseTools/Source/Python/Table/TableEotReport.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 import Common.LongFilePathOs as os, time\r
 from Table.Table import Table\r

diff --git a/BaseTools/Source/Python/Table/TableFdf.py b/BaseTools/Source/Python/Table/TableFdf.py
index 668f56269a70f20a657d17cdbaa07013b438096d..5b5e0d3f57c520cf95b39519d27a5936a17bf56e 100644 (file)
--- a/BaseTools/Source/Python/Table/TableFdf.py
+++ b/BaseTools/Source/Python/Table/TableFdf.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 import CommonDataClass.DataClass as DataClass\r
 from Table.Table import Table\r

diff --git a/BaseTools/Source/Python/Table/TableFile.py b/BaseTools/Source/Python/Table/TableFile.py
index 805a528cea879e2af4a42a14f6dca193aacbdd2c..bfcea583a95ee4f0a12b6f77d4ee8b66deb7c4f5 100644 (file)
--- a/BaseTools/Source/Python/Table/TableFile.py
+++ b/BaseTools/Source/Python/Table/TableFile.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 from Table.Table import Table\r
 from Common.StringUtils import ConvertToSqlString\r

diff --git a/BaseTools/Source/Python/Table/TableFunction.py b/BaseTools/Source/Python/Table/TableFunction.py
index ee677cf1079e445b209490b1c40a9ac8e66dd2ef..ebaddc5fff159e8c55d19085e5293ec06d23afd4 100644 (file)
--- a/BaseTools/Source/Python/Table/TableFunction.py
+++ b/BaseTools/Source/Python/Table/TableFunction.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 from Table.Table import Table\r
 from Common.StringUtils import ConvertToSqlString\r

diff --git a/BaseTools/Source/Python/Table/TableIdentifier.py b/BaseTools/Source/Python/Table/TableIdentifier.py
index 6b658cf35753408aff0dad2ad95bb74be5e1e42b..1d00c35f965145b55b0dffb35e01c1578b3958e9 100644 (file)
--- a/BaseTools/Source/Python/Table/TableIdentifier.py
+++ b/BaseTools/Source/Python/Table/TableIdentifier.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 from Common.StringUtils import ConvertToSqlString\r
 from Table.Table import Table\r

diff --git a/BaseTools/Source/Python/Table/TableInf.py b/BaseTools/Source/Python/Table/TableInf.py
index e0ffb170f994f54121d9b3cb5fc44824646b7b32..0401d46d6b00c67ee858c447c381ee26128c4622 100644 (file)
--- a/BaseTools/Source/Python/Table/TableInf.py
+++ b/BaseTools/Source/Python/Table/TableInf.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 import CommonDataClass.DataClass as DataClass\r
 from Table.Table import Table\r

diff --git a/BaseTools/Source/Python/Table/TablePcd.py b/BaseTools/Source/Python/Table/TablePcd.py
index 5096862e6e52e73e65579f88355af8be3bacbe12..caa82b7324f234fe476db76cfde2d7fe2465f372 100644 (file)
--- a/BaseTools/Source/Python/Table/TablePcd.py
+++ b/BaseTools/Source/Python/Table/TablePcd.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 from Table.Table import Table\r
 from Common.StringUtils import ConvertToSqlString\r

diff --git a/BaseTools/Source/Python/Table/TableQuery.py b/BaseTools/Source/Python/Table/TableQuery.py
index 8e7d313c71e2fd0adf7bfe7fb372dcd45266dc5b..fa807b882b88e4fc72c8063141ce00de3bd9cd1d 100644 (file)
--- a/BaseTools/Source/Python/Table/TableQuery.py
+++ b/BaseTools/Source/Python/Table/TableQuery.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 from Common.StringUtils import ConvertToSqlString\r
 from Table.Table import Table\r

diff --git a/BaseTools/Source/Python/Table/TableReport.py b/BaseTools/Source/Python/Table/TableReport.py
index 00022962ffe03bd6bb54eb12c4f9f36975ce52eb..54977010a208676bb27c71e06de2c11489961eac 100644 (file)
--- a/BaseTools/Source/Python/Table/TableReport.py
+++ b/BaseTools/Source/Python/Table/TableReport.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import Common.EdkLogger as EdkLogger\r
 import Common.LongFilePathOs as os, time\r
 from Table.Table import Table\r

diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/Source/Python/TargetTool/TargetTool.py
index 8d523a6ab8fc709a762915cbe83b37388ac6fa27..f9f7d3413588f154ff1078d2c764c9deaa3ee68d 100644 (file)
--- a/BaseTools/Source/Python/TargetTool/TargetTool.py
+++ b/BaseTools/Source/Python/TargetTool/TargetTool.py
@@ -12,7 +12,6 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
-from __future__ import print_function\r
 import Common.LongFilePathOs as os\r
 import sys\r
 import traceback\r

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 39db945fb86facc28ae5ebbb76ac1be34d4a42b4..8d1535e6e3f49a156a9ecbe0f9c94d9228998133 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -17,8 +17,6 @@
 #  This class is used to retrieve information stored in database and convert them\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

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 44d44d24eb6be378c6a21477e5eac485023e4b33..c606b1a404d50150533ed0ae81b706fa9161da2d 100644 (file)
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
-from __future__ import absolute_import\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from Common.caching import cached_property, cached_class_function\r

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index f1707c06feb9127080c41a04aa6bbe09c7163bcd..a3ff733f7e2c9581a66e57f60513192d093fe15f 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -15,8 +15,6 @@
 ##\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

diff --git a/BaseTools/Source/Python/Workspace/MetaFileTable.py b/BaseTools/Source/Python/Workspace/MetaFileTable.py
index e0a0b8d923517388871eed61cde6dc12997d1c5b..89fe97d60a324ed98682b90db1179fd6fd15576c 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileTable.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileTable.py
@@ -14,7 +14,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import uuid\r
 \r
 import Common.EdkLogger as EdkLogger\r

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
index 8d8a3e278987ee64f5fe0d3eb5ee32709730d0d4..4b9180334ff957a03939fd920e0144be6563aab3 100644 (file)
--- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
@@ -11,7 +11,6 @@
 # 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 .BuildClassObject import LibraryClassObject\r

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
index 3bb287b8b24c69a3480a0226e2a7167548e06cf7..50ffe308aabb9ba6f9d08e35fa257ae35c8e74f4 100644 (file)
--- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py
@@ -15,7 +15,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import absolute_import\r
 import sqlite3\r
 from Common.StringUtils import *\r
 from Common.DataType import *\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index d74082fc2666154ae59293b66dd770107a3cba7c..314eda78709a8bc6cab5797f24caba9f18131028 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -16,7 +16,6 @@
 ##\r
 # Import Modules\r
 #\r
-from __future__ import print_function\r
 import Common.LongFilePathOs as os\r
 import re\r
 from io import BytesIO\r