# file.\r
#\r
# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
\r
##\r
# Import Modules\r
# @retval: A list for formatted hex string\r
#\r
def AscToHexList(Ascii):\r
- return ['0x{0:02X}'.format(ord(Item)) for Item in Ascii]\r
+ try:\r
+ return ['0x{0:02X}'.format(Item) for Item in Ascii]\r
+ except:\r
+ return ['0x{0:02X}'.format(ord(Item)) for Item in Ascii]\r
\r
## Create content of .h file\r
#\r
# @retval Str: A string of .h file content\r
#\r
def CreateHFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag):\r
- Str = ''\r
+ Str = []\r
ValueStartPtr = 60\r
Line = COMMENT_DEFINE_STR + ' ' + LANGUAGE_NAME_STRING_NAME + ' ' * (ValueStartPtr - len(DEFINE_STR + LANGUAGE_NAME_STRING_NAME)) + DecToHexStr(0, 4) + COMMENT_NOT_REFERENCED\r
Str = WriteLine(Str, Line)\r
Line = COMMENT_DEFINE_STR + ' ' + Name + ' ' * (ValueStartPtr - len(DEFINE_STR + Name)) + DecToHexStr(Token, 4) + COMMENT_NOT_REFERENCED\r
UnusedStr = WriteLine(UnusedStr, Line)\r
\r
- Str = ''.join([Str, UnusedStr])\r
+ Str.extend( UnusedStr)\r
\r
Str = WriteLine(Str, '')\r
if IsCompatibleMode or UniGenCFlag:\r
Str = WriteLine(Str, 'extern unsigned char ' + BaseName + 'Strings[];')\r
- return Str\r
+ return "".join(Str)\r
\r
## Create a complete .h file\r
#\r
def CreateHFile(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag):\r
HFile = WriteLine('', CreateHFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag))\r
\r
- return HFile\r
+ return "".join(HFile)\r
\r
## Create a buffer to store all items in an array\r
#\r
MaxLength = Width\r
Index = 0\r
Line = ' '\r
- ArrayItem = ''\r
+ ArrayItem = []\r
\r
for Item in Array:\r
if Index < MaxLength:\r
Index = 1\r
ArrayItem = Write(ArrayItem, Line.rstrip())\r
\r
- return ArrayItem\r
+ return "".join(ArrayItem)\r
\r
## CreateCFileStringValue\r
#\r
Value = [StringBlockType] + Value\r
Str = WriteLine('', CreateArrayItem(Value))\r
\r
- return Str\r
+ return "".join(Str)\r
\r
## GetFilteredLanguage\r
#\r
#\r
AllStr = Write(AllStr, Str)\r
\r
- return AllStr\r
+ return "".join(AllStr)\r
\r
## Create end of .c file\r
#\r
CFile = ''\r
CFile = WriteLine(CFile, CreateCFileContent(BaseName, UniObjectClass, IsCompatibleMode, None, FilterInfo))\r
CFile = WriteLine(CFile, CreateCFileEnd())\r
- return CFile\r
+ return "".join(CFile)\r
\r
## GetFileList\r
#\r
#\r
# support ISO 639-2 codes in .UNI files of EDK Shell\r
#\r
- Uni = UniFileClassObject(sorted (UniFilList), True, IncludePathList)\r
+ Uni = UniFileClassObject(sorted(UniFilList, key=lambda x: x.File), True, IncludePathList)\r
else:\r
- Uni = UniFileClassObject(sorted (UniFilList), IsCompatibleMode, IncludePathList)\r
+ Uni = UniFileClassObject(sorted(UniFilList, key=lambda x: x.File), IsCompatibleMode, IncludePathList)\r
else:\r
EdkLogger.error("UnicodeStringGather", AUTOGEN_ERROR, 'No unicode files given')\r
\r
# Write an item\r
#\r
def Write(Target, Item):\r
- return ''.join([Target, Item])\r
+ if isinstance(Target,str):\r
+ Target = [Target]\r
+ if not Target:\r
+ Target = []\r
+ if isinstance(Item,list):\r
+ Target.extend(Item)\r
+ else:\r
+ Target.append(Item)\r
+ return Target\r
\r
#\r
# Write an item with a break line\r
#\r
def WriteLine(Target, Item):\r
- return ''.join([Target, Item, '\n'])\r
+ if isinstance(Target,str):\r
+ Target = [Target]\r
+ if not Target:\r
+ Target = []\r
+ if isinstance(Item, list):\r
+ Target.extend(Item)\r
+ else:\r
+ Target.append(Item)\r
+ Target.append('\n')\r
+ return Target\r
\r
# This acts like the main() function for the script, unless it is 'import'ed into another\r
# script.\r