X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FAutoGen%2FStrGather.py;h=ce8866f480d501b5646bbcac73ba912323ebf859;hb=b1aff264bf6a007a27d0ebadcce96b72b727c3c8;hp=e6f10142cb665af0de537cc94ffcce37ffc7a03b;hpb=549c59b30cdd5ca9c1b707df1d1ebda0060675e4;p=mirror_edk2.git diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py index e6f10142cb..ce8866f480 100644 --- a/BaseTools/Source/Python/AutoGen/StrGather.py +++ b/BaseTools/Source/Python/AutoGen/StrGather.py @@ -124,22 +124,6 @@ def DecToHexList(Dec, Digit = 8): def AscToHexList(Ascii): return ['0x{0:02X}'.format(ord(Item)) for Item in Ascii] -## Create header of .h file -# -# Create a header of .h file -# -# @param BaseName: The basename of strings -# -# @retval Str: A string for .h file header -# -def CreateHFileHeader(BaseName): - Str = '' - for Item in H_C_FILE_HEADER: - Str = WriteLine(Str, Item) - Str = WriteLine(Str, '#ifndef _' + BaseName.upper() + '_STRINGS_DEFINE_H_') - Str = WriteLine(Str, '#define _' + BaseName.upper() + '_STRINGS_DEFINE_H_') - return Str - ## Create content of .h file # # Create content of .h file @@ -166,7 +150,7 @@ def CreateHFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag): Name = StringItem.StringName Token = StringItem.Token Referenced = StringItem.Referenced - if Name != None: + if Name is not None: Line = '' if Referenced == True: if (ValueStartPtr - len(DEFINE_STR + Name)) <= 0: @@ -204,19 +188,6 @@ def CreateHFile(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag): return HFile -## Create header of .c file -# -# Create a header of .c file -# -# @retval Str: A string for .c file header -# -def CreateCFileHeader(): - Str = '' - for Item in H_C_FILE_HEADER: - Str = WriteLine(Str, Item) - - return Str - ## Create a buffer to store all items in an array # # @param BinBuffer Buffer to contain Binary data. @@ -287,7 +258,7 @@ def GetFilteredLanguage(UniLanguageList, LanguageFilterList): # first check for exact match if Language in UniLanguageList: if Language not in UniLanguageListFiltered: - UniLanguageListFiltered += [Language] + UniLanguageListFiltered.append(Language) # find the first one with the same/equivalent primary tag else: if Language.find('-') != -1: @@ -309,7 +280,7 @@ def GetFilteredLanguage(UniLanguageList, LanguageFilterList): if PrimaryTag == UniLanguagePrimaryTag: if UniLanguage not in UniLanguageListFiltered: - UniLanguageListFiltered += [UniLanguage] + UniLanguageListFiltered.append(UniLanguage) break else: # Here is rule 3 for "get best language" @@ -321,10 +292,10 @@ def GetFilteredLanguage(UniLanguageList, LanguageFilterList): for UniLanguage in UniLanguageList: if UniLanguage.startswith('en-') or UniLanguage.startswith('eng-'): if UniLanguage not in UniLanguageListFiltered: - UniLanguageListFiltered += [UniLanguage] + UniLanguageListFiltered.append(UniLanguage) break else: - UniLanguageListFiltered += [DefaultTag] + UniLanguageListFiltered.append(DefaultTag) return UniLanguageListFiltered @@ -493,7 +464,6 @@ def CreateCFileEnd(): # def CreateCFile(BaseName, UniObjectClass, IsCompatibleMode, FilterInfo): CFile = '' - #CFile = WriteLine(CFile, CreateCFileHeader()) CFile = WriteLine(CFile, CreateCFileContent(BaseName, UniObjectClass, IsCompatibleMode, None, FilterInfo)) CFile = WriteLine(CFile, CreateCFileEnd()) return CFile @@ -508,11 +478,11 @@ def CreateCFile(BaseName, UniObjectClass, IsCompatibleMode, FilterInfo): # @retval FileList: A list of all files found # def GetFileList(SourceFileList, IncludeList, SkipList): - if IncludeList == None: + if IncludeList is None: EdkLogger.error("UnicodeStringGather", AUTOGEN_ERROR, "Include path for unicode file is not defined") FileList = [] - if SkipList == None: + if SkipList is None: SkipList = [] for File in SourceFileList: