BaseTools: Handle the bytes and str difference

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

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 2efb2edd9ab1d9fda2f931379cb09832b0e7f376..a99d56a9fd82f8620e317755c976a5a4404a374f 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -522,7 +522,7 @@ class GenFds(object):
                 return\r
         elif GenFds.OnlyGenerateThisFv is None:\r
             for FvObj in GenFdsGlobalVariable.FdfParser.Profile.FvDict.values():\r
-                Buffer = BytesIO('')\r
+                Buffer = BytesIO()\r
                 FvObj.AddToBuffer(Buffer)\r
                 Buffer.close()\r
 \r
@@ -673,7 +673,7 @@ class GenFds(object):
     @staticmethod\r
     def GenerateGuidXRefFile(BuildDb, ArchList, FdfParserObj):\r
         GuidXRefFileName = os.path.join(GenFdsGlobalVariable.FvDir, "Guid.xref")\r
-        GuidXRefFile = BytesIO('')\r
+        GuidXRefFile = []\r
         PkgGuidDict = {}\r
         GuidDict = {}\r
         ModuleList = []\r
@@ -700,9 +700,9 @@ class GenFds(object):
                 else:\r
                     ModuleList.append(Module)\r
                 if GlobalData.gGuidPattern.match(ModuleFile.BaseName):\r
-                    GuidXRefFile.write("%s %s\n" % (ModuleFile.BaseName, Module.BaseName))\r
+                    GuidXRefFile.append("%s %s\n" % (ModuleFile.BaseName, Module.BaseName))\r
                 else:\r
-                    GuidXRefFile.write("%s %s\n" % (Module.Guid, Module.BaseName))\r
+                    GuidXRefFile.append("%s %s\n" % (Module.Guid, Module.BaseName))\r
                 GuidDict.update(Module.Protocols)\r
                 GuidDict.update(Module.Guids)\r
                 GuidDict.update(Module.Ppis)\r
@@ -715,7 +715,7 @@ class GenFds(object):
                             continue\r
                         else:\r
                             ModuleList.append(FdfModule)\r
-                        GuidXRefFile.write("%s %s\n" % (FdfModule.Guid, FdfModule.BaseName))\r
+                        GuidXRefFile.append("%s %s\n" % (FdfModule.Guid, FdfModule.BaseName))\r
                         GuidDict.update(FdfModule.Protocols)\r
                         GuidDict.update(FdfModule.Guids)\r
                         GuidDict.update(FdfModule.Ppis)\r
@@ -776,19 +776,19 @@ class GenFds(object):
                             continue\r
 \r
                         Name = ' '.join(Name) if isinstance(Name, type([])) else Name\r
-                        GuidXRefFile.write("%s %s\n" %(FileStatementGuid, Name))\r
+                        GuidXRefFile.append("%s %s\n" %(FileStatementGuid, Name))\r
 \r
        # Append GUIDs, Protocols, and PPIs to the Xref file\r
-        GuidXRefFile.write("\n")\r
+        GuidXRefFile.append("\n")\r
         for key, item in GuidDict.items():\r
-            GuidXRefFile.write("%s %s\n" % (GuidStructureStringToGuidString(item).upper(), key))\r
+            GuidXRefFile.append("%s %s\n" % (GuidStructureStringToGuidString(item).upper(), key))\r
 \r
-        if GuidXRefFile.getvalue():\r
-            SaveFileOnChange(GuidXRefFileName, GuidXRefFile.getvalue(), False)\r
+        if GuidXRefFile:\r
+            GuidXRefFile = ''.join(GuidXRefFile)\r
+            SaveFileOnChange(GuidXRefFileName, GuidXRefFile, False)\r
             GenFdsGlobalVariable.InfLogger("\nGUID cross reference file can be found at %s" % GuidXRefFileName)\r
         elif os.path.exists(GuidXRefFileName):\r
             os.remove(GuidXRefFileName)\r
-        GuidXRefFile.close()\r
 \r
 \r
 if __name__ == '__main__':\r