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, 5 deletions

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index 43b9c90b77..016ee0b9a2 100644
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -1086,7 +1086,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
     def __GenUniVfrOffsetFile(VfrUniOffsetList, UniVfrOffsetFileName):

 

         # Use a instance of StringIO to cache data

-        fStringIO = BytesIO('')

+        fStringIO = BytesIO()

 

         for Item in VfrUniOffsetList:

             if (Item[0].find("Strings") != -1):

@@ -1096,8 +1096,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
                 # { 0x8913c5e0, 0x33f6, 0x4d86, { 0x9b, 0xf1, 0x43, 0xef, 0x89, 0xfc, 0x6, 0x66 } }

                 #

                 UniGuid = [0xe0, 0xc5, 0x13, 0x89, 0xf6, 0x33, 0x86, 0x4d, 0x9b, 0xf1, 0x43, 0xef, 0x89, 0xfc, 0x6, 0x66]

-                UniGuid = [chr(ItemGuid) for ItemGuid in UniGuid]

-                fStringIO.write(''.join(UniGuid))

+                fStringIO.write(bytes(UniGuid))

                 UniValue = pack ('Q', int (Item[1], 16))

                 fStringIO.write (UniValue)

             else:

@@ -1107,8 +1106,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
                 # { 0xd0bc7cb4, 0x6a47, 0x495f, { 0xaa, 0x11, 0x71, 0x7, 0x46, 0xda, 0x6, 0xa2 } };

                 #

                 VfrGuid = [0xb4, 0x7c, 0xbc, 0xd0, 0x47, 0x6a, 0x5f, 0x49, 0xaa, 0x11, 0x71, 0x7, 0x46, 0xda, 0x6, 0xa2]

-                VfrGuid = [chr(ItemGuid) for ItemGuid in VfrGuid]

-                fStringIO.write(''.join(VfrGuid))

+                fStringIO.write(bytes(VfrGuid))

                 type (Item[1])

                 VfrValue = pack ('Q', int (Item[1], 16))

                 fStringIO.write (VfrValue)