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, 2 insertions, 8 deletions

diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Source/Python/Common/StringUtils.py
index 005dbd09bb..f667c4c916 100644
--- a/BaseTools/Source/Python/Common/StringUtils.py
+++ b/BaseTools/Source/Python/Common/StringUtils.py
@@ -815,11 +815,7 @@ def GetHelpTextList(HelpTextClassList):
     return List

 

 def StringToArray(String):

-    if isinstance(String, unicode):

-        if len(unicode) == 0:

-            return "{0x00,0x00}"

-        return "{%s,0x00,0x00}" % ",".join("0x%02x,0x00" % ord(C) for C in String)

-    elif String.startswith('L"'):

+    if String.startswith('L"'):

         if String == "L\"\"":

             return "{0x00,0x00}"

         else:

@@ -842,9 +838,7 @@ def StringToArray(String):
             return '{%s,0,0}' % ','.join(String.split())

 

 def StringArrayLength(String):

-    if isinstance(String, unicode):

-        return (len(String) + 1) * 2 + 1;

-    elif String.startswith('L"'):

+    if String.startswith('L"'):

         return (len(String) - 3 + 1) * 2

     elif String.startswith('"'):

         return (len(String) - 2 + 1)