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, 28 insertions, 27 deletions

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index e2e6df7167..5ff2e206db 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -17,35 +17,36 @@
 # Import Modules

 #

 from __future__ import print_function

+from __future__ import absolute_import

 import re

 

-import Fd

-import Region

-import Fv

-import AprioriSection

-import FfsInfStatement

-import FfsFileStatement

-import VerSection

-import UiSection

-import FvImageSection

-import DataSection

-import DepexSection

-import CompressSection

-import GuidSection

-import Capsule

-import CapsuleData

-import Rule

-import RuleComplexFile

-import RuleSimpleFile

-import EfiSection

-import Vtf

-import ComponentStatement

-import OptionRom

-import OptRomInfStatement

-import OptRomFileStatement

+from . import Fd

+from . import Region

+from . import Fv

+from . import AprioriSection

+from . import FfsInfStatement

+from . import FfsFileStatement

+from . import VerSection

+from . import UiSection

+from . import FvImageSection

+from . import DataSection

+from . import DepexSection

+from . import CompressSection

+from . import GuidSection

+from . import Capsule

+from . import CapsuleData

+from . import Rule

+from . import RuleComplexFile

+from . import RuleSimpleFile

+from . import EfiSection

+from . import Vtf

+from . import ComponentStatement

+from . import OptionRom

+from . import OptRomInfStatement

+from . import OptRomFileStatement

 import string

 

-from GenFdsGlobalVariable import GenFdsGlobalVariable

+from .GenFdsGlobalVariable import GenFdsGlobalVariable

 from Common.BuildToolError import *

 from Common import EdkLogger

 from Common.Misc import PathClass

@@ -60,8 +61,8 @@ from Common.Misc import tdict
 from Common.MultipleWorkspace import MultipleWorkspace as mws

 import Common.LongFilePathOs as os

 from Common.LongFilePathSupport import OpenLongFilePath as open

-from Capsule import EFI_CERT_TYPE_PKCS7_GUID

-from Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID

+from .Capsule import EFI_CERT_TYPE_PKCS7_GUID

+from .Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID

 from Common.RangeExpression import RangeExpression

 

 ##define T_CHAR_SPACE                ' '