BaseTools/GenFds: cleanup GenFds

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

diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/Python/GenFds/Capsule.py
index baa6e1dfa2ab8bc31f61aaaca0b8c0bc501ef82f..df29c40dbd205b3ecc122a95fc9613de1f20e4fb 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Capsule.py
+++ b/BaseTools/Source/Python/GenFds/Capsule.py
@@ -16,22 +16,18 @@
 # Import Modules\r
 #\r
 from __future__ import absolute_import\r
-from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
-from .GenFdsGlobalVariable import FindExtendTool\r
+from .GenFdsGlobalVariable import GenFdsGlobalVariable, FindExtendTool\r
 from CommonDataClass.FdfClass import CapsuleClassObject\r
 import Common.LongFilePathOs as os\r
-import subprocess\r
 from io import BytesIO\r
-from Common.Misc import SaveFileOnChange\r
-from Common.Misc import PackRegistryFormatGuid\r
+from Common.Misc import SaveFileOnChange, PackRegistryFormatGuid\r
 import uuid\r
 from struct import pack\r
 from Common import EdkLogger\r
-from Common.BuildToolError import *\r
+from Common.BuildToolError import GENFDS_ERROR\r
+from Common.DataType import TAB_LINE_BREAK\r
 \r
-\r
-T_CHAR_LF = '\n'\r
-WIN_CERT_REVISION      = 0x0200\r
+WIN_CERT_REVISION = 0x0200\r
 WIN_CERT_TYPE_EFI_GUID = 0x0EF1\r
 EFI_CERT_TYPE_PKCS7_GUID = uuid.UUID('{4aafd29d-68df-49ee-8aa9-347d375665a7}')\r
 EFI_CERT_TYPE_RSA2048_SHA256_GUID = uuid.UUID('{a7717414-c616-4977-9420-844712a735bf}')\r
@@ -39,7 +35,7 @@ EFI_CERT_TYPE_RSA2048_SHA256_GUID = uuid.UUID('{a7717414-c616-4977-9420-844712a7
 ## create inf file describes what goes into capsule and call GenFv to generate capsule\r
 #\r
 #\r
-class Capsule (CapsuleClassObject) :\r
+class Capsule (CapsuleClassObject):\r
     ## The constructor\r
     #\r
     #   @param  self        The object pointer\r
@@ -210,16 +206,16 @@ class Capsule (CapsuleClassObject) :
             return self.GenFmpCapsule()\r
 \r
         CapInfFile = self.GenCapInf()\r
-        CapInfFile.writelines("[files]" + T_CHAR_LF)\r
+        CapInfFile.writelines("[files]" + TAB_LINE_BREAK)\r
         CapFileList = []\r
-        for CapsuleDataObj in self.CapsuleDataList :\r
+        for CapsuleDataObj in self.CapsuleDataList:\r
             CapsuleDataObj.CapsuleName = self.CapsuleName\r
             FileName = CapsuleDataObj.GenCapsuleSubItem()\r
             CapsuleDataObj.CapsuleName = None\r
             CapFileList.append(FileName)\r
             CapInfFile.writelines("EFI_FILE_NAME = " + \\r
                                    FileName      + \\r
-                                   T_CHAR_LF)\r
+                                   TAB_LINE_BREAK)\r
         SaveFileOnChange(self.CapInfFileName, CapInfFile.getvalue(), False)\r
         CapInfFile.close()\r
         #\r
@@ -249,13 +245,13 @@ class Capsule (CapsuleClassObject) :
                                    self.UiCapsuleName +  "_Cap" + '.inf')\r
         CapInfFile = BytesIO() #open (self.CapInfFileName , 'w+')\r
 \r
-        CapInfFile.writelines("[options]" + T_CHAR_LF)\r
+        CapInfFile.writelines("[options]" + TAB_LINE_BREAK)\r
 \r
         for Item in self.TokensDict:\r
             CapInfFile.writelines("EFI_"                    + \\r
                                   Item                      + \\r
                                   ' = '                     + \\r
                                   self.TokensDict[Item]     + \\r
-                                  T_CHAR_LF)\r
+                                  TAB_LINE_BREAK)\r
 \r
         return CapInfFile\r