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, 1 insertions, 13 deletions

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index b435ffa569..1c86be4429 100644
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -45,18 +45,6 @@ BACK_SLASH_PLACEHOLDER = u'\u0006'
 

 gIncludePattern = re.compile("^#include +[\"<]+([^\"< >]+)[>\"]+$", re.MULTILINE | re.UNICODE)

 

-## Convert a python unicode string to a normal string

-#

-# Convert a python unicode string to a normal string

-# UniToStr(u'I am a string') is 'I am a string'

-#

-# @param Uni:  The python unicode string

-#

-# @retval:     The formatted normal string

-#

-def UniToStr(Uni):

-    return repr(Uni)[2:-1]

-

 ## Convert a unicode string to a Hex list

 #

 # Convert a unicode string to a Hex list

@@ -438,7 +426,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