BaseTools: Use absolute import in GenFds

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / Fv.py

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index d980020680f869e84aee691681c845e85b716fc3..097f51f39e272063abb34163134452c77c66ea77 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import\r
 ## @file\r
 # process FV generation\r
 #\r
@@ -20,11 +21,10 @@ import subprocess
 from io import BytesIO\r
 from struct import *\r
 \r
-import Ffs\r
-import AprioriSection\r
-import FfsFileStatement\r
-from GenFdsGlobalVariable import GenFdsGlobalVariable\r
-from GenFds import GenFds\r
+from . import Ffs\r
+from . import AprioriSection\r
+from . import FfsFileStatement\r
+from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
 from CommonDataClass.FdfClass import FvClassObject\r
 from Common.Misc import SaveFileOnChange, PackGUID\r
 from Common.LongFilePathSupport import CopyLongFilePath\r
@@ -53,7 +53,7 @@ class FV (FvClassObject):
         self.FvForceRebase = None\r
         self.FvRegionInFD = None\r
         self.UsedSizeEnable = False\r
-        \r
+\r
     ## AddToBuffer()\r
     #\r
     #   Generate Fv and add it to the Buffer\r
@@ -70,9 +70,10 @@ class FV (FvClassObject):
     #\r
     def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', VtfDict=None, MacroDict = {}, Flag=False) :\r
 \r
+        from .GenFds import GenFds\r
         if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFds.ImageBinDict:\r
             return GenFds.ImageBinDict[self.UiFvName.upper() + 'fv']\r
-        \r
+\r
         #\r
         # Check whether FV in Capsule is in FD flash region.\r
         # If yes, return error. Doesn't support FV in Capsule image is also in FD flash region.\r
@@ -92,7 +93,7 @@ class FV (FvClassObject):
             GenFdsGlobalVariable.InfLogger( "\nGenerating %s FV" %self.UiFvName)\r
         GenFdsGlobalVariable.LargeFileInFvFlags.append(False)\r
         FFSGuid = None\r
-        \r
+\r
         if self.FvBaseAddress is not None:\r
             BaseAddress = self.FvBaseAddress\r
         if not Flag:\r
@@ -289,7 +290,7 @@ class FV (FvClassObject):
                 if not self._GetBlockSize():\r
                     #set default block size is 1\r
                     self.FvInfFile.writelines("EFI_BLOCK_SIZE  = 0x1" + TAB_LINE_BREAK)\r
-            \r
+\r
             for BlockSize in self.BlockSizeList :\r
                 if BlockSize[0] is not None:\r
                     self.FvInfFile.writelines("EFI_BLOCK_SIZE  = "  + \\r
@@ -331,7 +332,7 @@ class FV (FvClassObject):
                                        self.FvAlignment.strip() + \\r
                                        " = TRUE"                + \\r
                                        TAB_LINE_BREAK)\r
-                                       \r
+\r
         #\r
         # Generate FV extension header file\r
         #\r
@@ -387,7 +388,7 @@ class FV (FvClassObject):
                     TotalSize += (Size + 4)\r
                     FvExtFile.seek(0)\r
                     Buffer += pack('HH', (Size + 4), int(self.FvExtEntryTypeValue[Index], 16))\r
-                    Buffer += FvExtFile.read() \r
+                    Buffer += FvExtFile.read()\r
                     FvExtFile.close()\r
                 if self.FvExtEntryType[Index] == 'DATA':\r
                     ByteList = self.FvExtEntryData[Index].split(',')\r
@@ -418,7 +419,7 @@ class FV (FvClassObject):
                                            FvExtHeaderFileName                  + \\r
                                            TAB_LINE_BREAK)\r
 \r
-         \r
+\r
         #\r
         # Add [Files]\r
         #\r