BaseTool: Fixed the incorrect cache key.

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / StrGather.py

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index 9f70d4e5b717195a7baa0a3dd321bf11c1baa737..a702ef0dd583df6648a1ef887e5a8ee29cfd41d6 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -1,5 +1,5 @@
 ## @file\r
-# This file is used to parse a strings file and create or add to a string database \r
+# This file is used to parse a strings file and create or add to a string database\r
 # file.\r
 #\r
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
@@ -18,7 +18,7 @@ import re
 import Common.EdkLogger as EdkLogger\r
 from Common.BuildToolError import *\r
 from UniClassObject import *\r
-from StringIO import StringIO\r
+from io import BytesIO\r
 from struct import pack, unpack\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
@@ -144,7 +144,7 @@ def CreateHFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag):
     Str = WriteLine(Str, Line)\r
     UnusedStr = ''\r
 \r
-    #Group the referred/Unused STRING token together. \r
+    #Group the referred/Unused STRING token together.\r
     for Index in range(2, len(UniObjectClass.OrderedStringList[UniObjectClass.LanguageDef[0][0]])):\r
         StringItem = UniObjectClass.OrderedStringList[UniObjectClass.LanguageDef[0][0]][Index]\r
         Name = StringItem.StringName\r
@@ -265,16 +265,16 @@ def GetFilteredLanguage(UniLanguageList, LanguageFilterList):
                 PrimaryTag = Language[0:Language.find('-')].lower()\r
             else:\r
                 PrimaryTag = Language\r
-            \r
+\r
             if len(PrimaryTag) == 3:\r
                 PrimaryTag = LangConvTable.get(PrimaryTag)\r
-            \r
+\r
             for UniLanguage in UniLanguageList:\r
                 if UniLanguage.find('-') != -1:\r
                     UniLanguagePrimaryTag = UniLanguage[0:UniLanguage.find('-')].lower()\r
                 else:\r
                     UniLanguagePrimaryTag = UniLanguage\r
-                \r
+\r
                 if len(UniLanguagePrimaryTag) == 3:\r
                     UniLanguagePrimaryTag = LangConvTable.get(UniLanguagePrimaryTag)\r
 \r
@@ -307,7 +307,7 @@ def GetFilteredLanguage(UniLanguageList, LanguageFilterList):
 # @param UniObjectClass   A UniObjectClass instance\r
 # @param IsCompatibleMode Compatible mode\r
 # @param UniBinBuffer     UniBinBuffer to contain UniBinary data.\r
-# @param FilterInfo       Platform language filter information \r
+# @param FilterInfo       Platform language filter information\r
 #\r
 # @retval Str:           A string of .c file content\r
 #\r
@@ -325,14 +325,14 @@ def CreateCFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniBinBuffer,
     else:\r
         # EDK module is using ISO639-2 format filter, convert to the RFC4646 format\r
         LanguageFilterList = [LangConvTable.get(F.lower()) for F in FilterInfo[1]]\r
-    \r
+\r
     UniLanguageList = []\r
     for IndexI in range(len(UniObjectClass.LanguageDef)):\r
         UniLanguageList += [UniObjectClass.LanguageDef[IndexI][0]]\r
 \r
     UniLanguageListFiltered = GetFilteredLanguage(UniLanguageList, LanguageFilterList)\r
- \r
-        \r
+\r
+\r
     #\r
     # Create lines for each language's strings\r
     #\r
@@ -340,8 +340,8 @@ def CreateCFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniBinBuffer,
         Language = UniObjectClass.LanguageDef[IndexI][0]\r
         if Language not in UniLanguageListFiltered:\r
             continue\r
-        \r
-        StringBuffer = StringIO()\r
+\r
+        StringBuffer = BytesIO()\r
         StrStringValue = ''\r
         ArrayLength = 0\r
         NumberOfUseOtherLangDef = 0\r
@@ -403,7 +403,7 @@ def CreateCFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniBinBuffer,
         # Add an EFI_HII_SIBT_END at last\r
         #\r
         Str = WriteLine(Str, '  ' + EFI_HII_SIBT_END + ",")\r
-        \r
+\r
         #\r
         # Create binary UNI string\r
         #\r
@@ -458,7 +458,7 @@ def CreateCFileEnd():
 # @param BaseName:        The basename of strings\r
 # @param UniObjectClass   A UniObjectClass instance\r
 # @param IsCompatibleMode Compatible Mode\r
-# @param FilterInfo       Platform language filter information \r
+# @param FilterInfo       Platform language filter information\r
 #\r
 # @retval CFile:          A string of complete .c file\r
 #\r
@@ -544,7 +544,7 @@ def SearchString(UniObjectClass, FileList, IsCompatibleMode):
 # This function is used for UEFI2.1 spec\r
 #\r
 #\r
-def GetStringFiles(UniFilList, SourceFileList, IncludeList, IncludePathList, SkipList, BaseName, IsCompatibleMode = False, ShellMode = False, UniGenCFlag = True, UniGenBinBuffer = None, FilterInfo = [True, []]):  \r
+def GetStringFiles(UniFilList, SourceFileList, IncludeList, IncludePathList, SkipList, BaseName, IsCompatibleMode = False, ShellMode = False, UniGenCFlag = True, UniGenBinBuffer = None, FilterInfo = [True, []]):\r
     if len(UniFilList) > 0:\r
         if ShellMode:\r
             #\r