BaseTools: fix imports

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

diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Source/Python/GenFds/GuidSection.py
index 08665a3d4d491a25b95d012fbe234d8d07cc57d0..52b97300ecac8ae105a8f4f50532ce3bfd1a8537 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GuidSection.py
+++ b/BaseTools/Source/Python/GenFds/GuidSection.py
@@ -2,6 +2,7 @@
 # process GUIDed section generation\r
 #\r
 #  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -15,19 +16,20 @@
 ##\r
 # Import Modules\r
 #\r
-import Section\r
+from __future__ import absolute_import\r
+from . import Section\r
 import subprocess\r
-from Ffs import Ffs\r
+from .Ffs import SectionSuffix\r
 import Common.LongFilePathOs as os\r
-from GenFdsGlobalVariable import GenFdsGlobalVariable\r
+from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
+from .GenFdsGlobalVariable import FindExtendTool\r
 from CommonDataClass.FdfClass import GuidSectionClassObject\r
-from Common import ToolDefClassObject\r
 import sys\r
 from Common import EdkLogger\r
 from Common.BuildToolError import *\r
-from FvImageSection import FvImageSection\r
+from .FvImageSection import FvImageSection\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
-from GenFds import FindExtendTool\r
+from Common.DataType import *\r
 \r
 ## generate GUIDed section\r
 #\r
@@ -74,7 +76,7 @@ class GuidSection(GuidSectionClassObject) :
             FvAddrIsSet = True\r
         else:\r
             FvAddrIsSet = False\r
-        \r
+\r
         if self.ProcessRequired in ("TRUE", "1"):\r
             if self.FvAddr != []:\r
                 #no use FvAddr when the image is processed.\r
@@ -121,9 +123,9 @@ class GuidSection(GuidSectionClassObject) :
         OutputFile = OutputPath + \\r
                      os.sep + \\r
                      ModuleName + \\r
-                     'SEC' + \\r
+                     SUP_MODULE_SEC + \\r
                      SecNum + \\r
-                     Ffs.SectionSuffix['GUIDED']\r
+                     SectionSuffix['GUIDED']\r
         OutputFile = os.path.normpath(OutputFile)\r
 \r
         ExternalTool = None\r
@@ -156,7 +158,7 @@ class GuidSection(GuidSectionClassObject) :
             TempFile = OutputPath + \\r
                        os.sep + \\r
                        ModuleName + \\r
-                       'SEC' + \\r
+                       SUP_MODULE_SEC + \\r
                        SecNum + \\r
                        '.tmp'\r
             TempFile = os.path.normpath(TempFile)\r
@@ -272,7 +274,7 @@ class GuidSection(GuidSectionClassObject) :
                 self.Alignment = None\r
                 self.IncludeFvSection = False\r
                 self.ProcessRequired = "TRUE"\r
-            if IsMakefile and self.Alignment.strip() == '0':\r
+            if IsMakefile and self.Alignment is not None and self.Alignment.strip() == '0':\r
                 self.Alignment = '1'\r
             return OutputFileList, self.Alignment\r
 \r