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, 11 insertions, 11 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index f99d9f5d18..26017c6544 100644
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -291,7 +291,7 @@ class DbItemList:
 

         PackStr = PACK_CODE_BY_SIZE[self.ItemSize]

 

-        Buffer = ''

+        Buffer = bytearray()

         for Datas in self.RawDataList:

             if type(Datas) in (list, tuple):

                 for Data in Datas:

@@ -316,7 +316,7 @@ class DbExMapTblItemList (DbItemList):
         DbItemList.__init__(self, ItemSize, DataList, RawDataList)

 

     def PackData(self):

-        Buffer = ''

+        Buffer = bytearray()

         PackStr = "=LHH"

         for Datas in self.RawDataList:

             Buffer += pack(PackStr,

@@ -365,7 +365,7 @@ class DbComItemList (DbItemList):
     def PackData(self):

         PackStr = PACK_CODE_BY_SIZE[self.ItemSize]

 

-        Buffer = ''

+        Buffer = bytearray()

         for DataList in self.RawDataList:

             for Data in DataList:

                 if type(Data) in (list, tuple):

@@ -386,7 +386,7 @@ class DbVariableTableItemList (DbComItemList):
 

     def PackData(self):

         PackStr = "=LLHHLHH"

-        Buffer = ''

+        Buffer = bytearray()

         for DataList in self.RawDataList:

             for Data in DataList:

                 Buffer += pack(PackStr,

@@ -447,7 +447,7 @@ class DbSkuHeadTableItemList (DbItemList):
 

     def PackData(self):

         PackStr = "=LL"

-        Buffer = ''

+        Buffer = bytearray()

         for Data in self.RawDataList:

             Buffer += pack(PackStr,

                            GetIntegerValue(Data[0]),

@@ -469,7 +469,7 @@ class DbSizeTableItemList (DbItemList):
         return length * self.ItemSize

     def PackData(self):

         PackStr = "=H"

-        Buffer = ''

+        Buffer = bytearray()

         for Data in self.RawDataList:

             Buffer += pack(PackStr,

                            GetIntegerValue(Data[0]))

@@ -849,7 +849,7 @@ def BuildExDataBase(Dict):
     Index = 0

     for Item in DbItemTotal:

         Index +=1

-        b = Item.PackData()

+        b = bytes(Item.PackData())

         Buffer += b

         if Index == InitTableNum:

             if len(Buffer) % 8:

@@ -917,9 +917,9 @@ def CreatePcdDataBase(PcdDBData):
     totallenbuff = pack("=L", totallen)

     newbuffer = databasebuff[:32]

     for i in range(4):

-        newbuffer += totallenbuff[i]

+        newbuffer += bytes([totallenbuff[i]])

     for i in range(36, totallen):

-        newbuffer += databasebuff[i]

+        newbuffer += bytes([databasebuff[i]])

 

     return newbuffer

 

@@ -962,7 +962,7 @@ def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform, Phase):
             AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer, VarCheckTab = CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdSet_Sku[(skuname, skuid)], Phase)

             final_data = ()

             for item in PcdDbBuffer:

-                final_data += unpack("B", item)

+                final_data += unpack("B", bytes([item]))

             PcdDBData[(skuname, skuid)] = (PcdDbBuffer, final_data)

             PcdDriverAutoGenData[(skuname, skuid)] = (AdditionalAutoGenH, AdditionalAutoGenC)

             VarCheckTableData[(skuname, skuid)] = VarCheckTab

@@ -975,7 +975,7 @@ def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform, Phase):
         AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer, VarCheckTab = CreatePcdDatabasePhaseSpecificAutoGen (Platform, {}, Phase)

         final_data = ()

         for item in PcdDbBuffer:

-            final_data += unpack("B", item)

+            final_data += unpack("B", bytes([item]))

         PcdDBData[(TAB_DEFAULT, "0")] = (PcdDbBuffer, final_data)

 

     return AdditionalAutoGenH, AdditionalAutoGenC, CreatePcdDataBase(PcdDBData)