BaseTools: Handle the bytes and str difference

Deal with bytes and str is different, remove the unicode()
Using utcfromtimestamp instead of fromtimestamp.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 904bd84089..e135139bc1 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -27,6 +27,7 @@ from Workspace.BuildClassObject import PcdClassObject
 from . import RuleComplexFile

 from .EfiSection import EfiSection

 from io import BytesIO

+from io import StringIO

 import Common.TargetTxtClassObject as TargetTxtClassObject

 import Common.ToolDefClassObject as ToolDefClassObject

 from Common.DataType import *

@@ -454,7 +455,7 @@ class GenFds :
                 return

         elif GenFds.OnlyGenerateThisFv is None:

             for FvObj in GenFdsGlobalVariable.FdfParser.Profile.FvDict.values():

-                Buffer = BytesIO('')

+                Buffer = BytesIO()

                 FvObj.AddToBuffer(Buffer)

                 Buffer.close()

 

@@ -600,7 +601,7 @@ class GenFds :
 

     def GenerateGuidXRefFile(BuildDb, ArchList, FdfParserObj):

         GuidXRefFileName = os.path.join(GenFdsGlobalVariable.FvDir, "Guid.xref")

-        GuidXRefFile = BytesIO('')

+        GuidXRefFile = StringIO('')

         PkgGuidDict = {}

         GuidDict = {}

         ModuleList = []