BaseTools: Handle the bytes and str difference

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

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 764d95ec66..d162387cc5 100644
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -24,7 +24,7 @@ from io import BytesIO
 from Common.BuildToolError import *

 from Common.StringUtils import GetLineNo

 from Common.Misc import PathClass

-from Common.LongFilePathSupport import LongFilePath, UniToStr

+from Common.LongFilePathSupport import LongFilePath

 from Common.GlobalData import *

 ##

 # Static definitions

@@ -427,7 +427,7 @@ class UniFileClassObject(object):
                 if EndPos != -1 and EndPos - StartPos == 6 :

                     if g4HexChar.match(Line[StartPos + 2 : EndPos], re.UNICODE):

                         EndStr = Line[EndPos: ]

-                        UniStr = ('\u' + (Line[StartPos + 2 : EndPos])).decode('unicode_escape')

+                        UniStr = Line[StartPos + 2: EndPos]

                         if EndStr.startswith(u'\\x') and len(EndStr) >= 7:

                             if EndStr[6] == u'\\' and g4HexChar.match(EndStr[2 : 6], re.UNICODE):

                                 Line = Line[0 : StartPos] + UniStr + EndStr