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

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 33cc9db735..765aa5dbc6 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -28,7 +28,7 @@ import hashlib
 import subprocess

 import threading

 from datetime import datetime

-from io import BytesIO

+from io import StringIO

 from Common import EdkLogger

 from Common.Misc import SaveFileOnChange

 from Common.Misc import GuidStructureByteArrayToGuidString

@@ -641,7 +641,7 @@ class ModuleReport(object):
 

                 Match = gTimeStampPattern.search(FileContents)

                 if Match:

-                    self.BuildTimeStamp = datetime.fromtimestamp(int(Match.group(1)))

+                    self.BuildTimeStamp = datetime.utcfromtimestamp(int(Match.group(1)))

             except IOError:

                 EdkLogger.warn(None, "Fail to read report file", FwReportFileName)

 

@@ -726,8 +726,8 @@ def ReadMessage(From, To, ExitFlag):
         # read one line a time

         Line = From.readline()

         # empty string means "end"

-        if Line is not None and Line != "":

-            To(Line.rstrip())

+        if Line is not None and Line != b"":

+            To(Line.rstrip().decode(encoding='utf-8', errors='ignore'))

         else:

             break

         if ExitFlag.isSet():

@@ -2246,7 +2246,7 @@ class BuildReport(object):
     def GenerateReport(self, BuildDuration, AutoGenTime, MakeTime, GenFdsTime):

         if self.ReportFile:

             try:

-                File = BytesIO('')

+                File = StringIO('')

                 for (Wa, MaList) in self.ReportList:

                     PlatformReport(Wa, MaList, self.ReportType).GenerateReport(File, BuildDuration, AutoGenTime, MakeTime, GenFdsTime, self.ReportType)

                 Content = FileLinesSplit(File.getvalue(), gLineMaxLength)