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, 14 insertions, 16 deletions

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 2815091de8..1e5f86937d 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -661,7 +661,7 @@ class WorkspaceAutoGen(AutoGen):
             for files in AllWorkSpaceMetaFiles:

                 if files.endswith('.dec'):

                     continue

-                f = open(files, 'r')

+                f = open(files, 'rb')

                 Content = f.read()

                 f.close()

                 m.update(Content)

@@ -690,7 +690,7 @@ class WorkspaceAutoGen(AutoGen):
         HashFile = os.path.join(PkgDir, Pkg.PackageName + '.hash')

         m = hashlib.md5()

         # Get .dec file's hash value

-        f = open(Pkg.MetaFile.Path, 'r')

+        f = open(Pkg.MetaFile.Path, 'rb')

         Content = f.read()

         f.close()

         m.update(Content)

@@ -700,7 +700,7 @@ class WorkspaceAutoGen(AutoGen):
                 for Root, Dirs, Files in os.walk(str(inc)):

                     for File in sorted(Files):

                         File_Path = os.path.join(Root, File)

-                        f = open(File_Path, 'r')

+                        f = open(File_Path, 'rb')

                         Content = f.read()

                         f.close()

                         m.update(Content)

@@ -1602,7 +1602,7 @@ class PlatformAutoGen(AutoGen):
         for pcd in self._DynamicPcdList:

             if len(pcd.SkuInfoList) == 1:

                 for (SkuName, SkuId) in allskuset:

-                    if type(SkuId) in (str, unicode) and eval(SkuId) == 0 or SkuId == 0:

+                    if isinstance(SkuId, str) and eval(SkuId) == 0 or SkuId == 0:

                         continue

                     pcd.SkuInfoList[SkuName] = copy.deepcopy(pcd.SkuInfoList[TAB_DEFAULT])

                     pcd.SkuInfoList[SkuName].SkuId = SkuId

@@ -3207,7 +3207,7 @@ class ModuleAutoGen(AutoGen):
             AutoFile = PathClass(gAutoGenStringFileName % {"module_name":self.Name}, self.DebugDir)

             RetVal[AutoFile] = str(StringH)

             self._ApplyBuildRule(AutoFile, TAB_UNKNOWN_FILE)

-        if UniStringBinBuffer is not None and UniStringBinBuffer.getvalue() != "":

+        if UniStringBinBuffer is not None and UniStringBinBuffer.getvalue() != b"":

             AutoFile = PathClass(gAutoGenStringFormFileName % {"module_name":self.Name}, self.OutputDir)

             RetVal[AutoFile] = UniStringBinBuffer.getvalue()

             AutoFile.IsBinary = True

@@ -3218,7 +3218,7 @@ class ModuleAutoGen(AutoGen):
             AutoFile = PathClass(gAutoGenImageDefFileName % {"module_name":self.Name}, self.DebugDir)

             RetVal[AutoFile] = str(StringIdf)

             self._ApplyBuildRule(AutoFile, TAB_UNKNOWN_FILE)

-        if IdfGenBinBuffer is not None and IdfGenBinBuffer.getvalue() != "":

+        if IdfGenBinBuffer is not None and IdfGenBinBuffer.getvalue() != b"":

             AutoFile = PathClass(gAutoGenIdfFileName % {"module_name":self.Name}, self.OutputDir)

             RetVal[AutoFile] = IdfGenBinBuffer.getvalue()

             AutoFile.IsBinary = True

@@ -3449,7 +3449,7 @@ class ModuleAutoGen(AutoGen):
             EdkLogger.error("build", FILE_OPEN_FAILURE, "File open failed for %s" % UniVfrOffsetFileName, None)

 

         # Use a instance of BytesIO to cache data

-        fStringIO = BytesIO('')

+        fStringIO = BytesIO()

 

         for Item in VfrUniOffsetList:

             if (Item[0].find("Strings") != -1):

@@ -3459,8 +3459,7 @@ class ModuleAutoGen(AutoGen):
                 # { 0x8913c5e0, 0x33f6, 0x4d86, { 0x9b, 0xf1, 0x43, 0xef, 0x89, 0xfc, 0x6, 0x66 } }

                 #

                 UniGuid = [0xe0, 0xc5, 0x13, 0x89, 0xf6, 0x33, 0x86, 0x4d, 0x9b, 0xf1, 0x43, 0xef, 0x89, 0xfc, 0x6, 0x66]

-                UniGuid = [chr(ItemGuid) for ItemGuid in UniGuid]

-                fStringIO.write(''.join(UniGuid))

+                fStringIO.write(bytes(UniGuid))

                 UniValue = pack ('Q', int (Item[1], 16))

                 fStringIO.write (UniValue)

             else:

@@ -3470,8 +3469,7 @@ class ModuleAutoGen(AutoGen):
                 # { 0xd0bc7cb4, 0x6a47, 0x495f, { 0xaa, 0x11, 0x71, 0x7, 0x46, 0xda, 0x6, 0xa2 } };

                 #

                 VfrGuid = [0xb4, 0x7c, 0xbc, 0xd0, 0x47, 0x6a, 0x5f, 0x49, 0xaa, 0x11, 0x71, 0x7, 0x46, 0xda, 0x6, 0xa2]

-                VfrGuid = [chr(ItemGuid) for ItemGuid in VfrGuid]

-                fStringIO.write(''.join(VfrGuid))

+                fStringIO.write(bytes(VfrGuid))

                 VfrValue = pack ('Q', int (Item[1], 16))

                 fStringIO.write (VfrValue)

         #

@@ -4019,29 +4017,29 @@ class ModuleAutoGen(AutoGen):
             GlobalData.gModuleHash[self.Arch] = {}

         m = hashlib.md5()

         # Add Platform level hash

-        m.update(GlobalData.gPlatformHash)

+        m.update(GlobalData.gPlatformHash.encode('utf-8'))

         # Add Package level hash

         if self.DependentPackageList:

             for Pkg in sorted(self.DependentPackageList, key=lambda x: x.PackageName):

                 if Pkg.PackageName in GlobalData.gPackageHash[self.Arch]:

-                    m.update(GlobalData.gPackageHash[self.Arch][Pkg.PackageName])

+                    m.update(GlobalData.gPackageHash[self.Arch][Pkg.PackageName].encode('utf-8'))

 

         # Add Library hash

         if self.LibraryAutoGenList:

             for Lib in sorted(self.LibraryAutoGenList, key=lambda x: x.Name):

                 if Lib.Name not in GlobalData.gModuleHash[self.Arch]:

                     Lib.GenModuleHash()

-                m.update(GlobalData.gModuleHash[self.Arch][Lib.Name])

+                m.update(GlobalData.gModuleHash[self.Arch][Lib.Name].encode('utf-8'))

 

         # Add Module self

-        f = open(str(self.MetaFile), 'r')

+        f = open(str(self.MetaFile), 'rb')

         Content = f.read()

         f.close()

         m.update(Content)

         # Add Module's source files

         if self.SourceFileList:

             for File in sorted(self.SourceFileList, key=lambda x: str(x)):

-                f = open(str(File), 'r')

+                f = open(str(File), 'rb')

                 Content = f.read()

                 f.close()

                 m.update(Content)