BaseTools: Handle the bytes and str difference

[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 1cdbdcf7ba86331ff743627025f3570489d71c08..9013fca41053dcf92494137747f65d80e4f3b2c3 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Capsule.py
+++ b/BaseTools/Source/Python/GenFds/Capsule.py
@@ -181,7 +181,7 @@ class Capsule (CapsuleClassObject):
         #\r
         # The real capsule header structure is 28 bytes\r
         #\r
-        Header.write('\x00'*(HdrSize-28))\r
+        Header.write(b'\x00'*(HdrSize-28))\r
         Header.write(FwMgrHdr.getvalue())\r
         Header.write(Content.getvalue())\r
         #\r
@@ -206,18 +206,17 @@ class Capsule (CapsuleClassObject):
             return self.GenFmpCapsule()\r
 \r
         CapInfFile = self.GenCapInf()\r
-        CapInfFile.writelines("[files]" + TAB_LINE_BREAK)\r
+        CapInfFile.append("[files]" + TAB_LINE_BREAK)\r
         CapFileList = []\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
+            CapInfFile.append("EFI_FILE_NAME = " + \\r
                                    FileName      + \\r
                                    TAB_LINE_BREAK)\r
-        SaveFileOnChange(self.CapInfFileName, CapInfFile.getvalue(), False)\r
-        CapInfFile.close()\r
+        SaveFileOnChange(self.CapInfFileName, ''.join(CapInfFile), False)\r
         #\r
         # Call GenFv tool to generate capsule\r
         #\r
@@ -243,12 +242,12 @@ class Capsule (CapsuleClassObject):
     def GenCapInf(self):\r
         self.CapInfFileName = os.path.join(GenFdsGlobalVariable.FvDir,\r
                                    self.UiCapsuleName +  "_Cap" + '.inf')\r
-        CapInfFile = BytesIO() #open (self.CapInfFileName , 'w+')\r
+        CapInfFile = []\r
 \r
-        CapInfFile.writelines("[options]" + TAB_LINE_BREAK)\r
+        CapInfFile.append("[options]" + TAB_LINE_BREAK)\r
 \r
         for Item in self.TokensDict:\r
-            CapInfFile.writelines("EFI_"                    + \\r
+            CapInfFile.append("EFI_"                    + \\r
                                   Item                      + \\r
                                   ' = '                     + \\r
                                   self.TokensDict[Item]     + \\r