BaseTools: Use absolute import in GenFds

Based on "futurize -f libfuturize.fixes.fix_absolute_import"

Since circular import is not allowed after adopting absolute import, the
following changes are applied to break the circles.

* BaseTools/Source/Python/GenFds/Capsule.py
  - Delay "from .GenFds import GenFds" until GenCapsule()
  - Delay "from .GenFds import FindExtendTool" until GenFmpCapsule()
  To break the circle:
  AutoGen.AutoGen => GenFds.FdfParser => GenFds.Capsule => GenFds.GenFds =>
  GenFds.FdfParser

* BaseTools/Source/Python/GenFds/Fd.py
  - Delay "from .GenFds import GenFds" until GenFd()
  To break the circle:
  AutoGen.AutoGen => GenFds.FdfParser => GenFds.Fd => GenFds.GenFds =>
  GenFds.FdfParser

* BaseTools/Source/Python/GenFds/Fv.py
  - Delay "from .GenFds import GenFds" until AddToBuffer()
  To break the circle:
  AutoGen.AutoGen => GenFds.FdfParser => GenFds.Fd => GenFds.Fv =>
  GenFds.GenFds => GenFds.FdfParser

* BaseTools/Source/Python/GenFds/GuidSection.py
  - Delay "from .GenFds import FindExtendTool" until GuidSection()
  To break the circle:
  AutoGen.AutoGen => GenFds.FdfParser => GenFds.Fd => GenFds.Fv =>
  GenFds.AprioriSection => GenFds.FfsFileStatement => GenFds.GuidSection =>
  GenFds.GenFds => GenFds.FdfParser

* BaseTools/Source/Python/GenFds/OptRomInfStatement.py
  - Delay "from . import OptionRom" until __GetOptRomParams()
  To break the circle:
  AutoGen.AutoGen => GenFds.FdfParser => GenFds.OptionRom =>
  GenFds.OptRomInfStatement => GenFds.OptionRom

* BaseTools/Source/Python/GenFds/OptionRom.py
  - Remove the unused "from GenFds import GenFds"
  To break the circle:
  AutoGen.AutoGen => GenFds.FdfParser => GenFds.OptionRom =>
  GenFds.GenFds => GenFds.FdfParser

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>

1 files changed, 10 insertions, 9 deletions

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index adb9a95beb..56bb966698 100644
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -16,17 +16,18 @@
 ##

 # Import Modules

 #

-import Rule

+from __future__ import absolute_import

+from . import Rule

 import Common.LongFilePathOs as os

 from io import BytesIO

 from struct import *

-from GenFdsGlobalVariable import GenFdsGlobalVariable

-import Ffs

+from .GenFdsGlobalVariable import GenFdsGlobalVariable

+from . import Ffs

 import subprocess

 import sys

-import Section

-import RuleSimpleFile

-import RuleComplexFile

+from . import Section

+from . import RuleSimpleFile

+from . import RuleComplexFile

 from CommonDataClass.FdfClass import FfsInfStatementClassObject

 from Common.MultipleWorkspace import MultipleWorkspace as mws

 from Common.StringUtils import *

@@ -36,15 +37,15 @@ from Common.Misc import ProcessDuplicatedInf
 from Common.Misc import GetVariableOffset

 from Common import EdkLogger

 from Common.BuildToolError import *

-from GuidSection import GuidSection

-from FvImageSection import FvImageSection

+from .GuidSection import GuidSection

+from .FvImageSection import FvImageSection

 from Common.Misc import PeImageClass

 from AutoGen.GenDepex import DependencyExpression

 from PatchPcdValue.PatchPcdValue import PatchBinaryFile

 from Common.LongFilePathSupport import CopyLongFilePath

 from Common.LongFilePathSupport import OpenLongFilePath as open

 import Common.GlobalData as GlobalData

-from DepexSection import DepexSection

+from .DepexSection import DepexSection

 from Common.Misc import SaveFileOnChange

 from Common.Expression import *

 from Common.DataType import *