functions (like join) can use the iterator just as easily.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
'build',\r
FORMAT_INVALID,\r
"Building modules from source INFs, following PCD use %s and %s access method. It must be corrected to use only one access method." % (i, j),\r
- ExtraData="%s" % '\n\t'.join([str(P[1]+'.'+P[0]) for P in Intersections])\r
+ ExtraData="%s" % '\n\t'.join(str(P[1]+'.'+P[0]) for P in Intersections)\r
)\r
\r
#\r
#\r
for Item in LibraryList:\r
if ConsumedByList[Item] != [] and Item in Constructor and len(Constructor) > 1:\r
- ErrorMessage = "\tconsumed by " + "\n\tconsumed by ".join([str(L) for L in ConsumedByList[Item]])\r
+ ErrorMessage = "\tconsumed by " + "\n\tconsumed by ".join(str(L) for L in ConsumedByList[Item])\r
EdkLogger.error("build", BUILD_ERROR, 'Library [%s] with constructors has a cycle' % str(Item),\r
ExtraData=ErrorMessage, File=self.MetaFile)\r
if Item not in SortedLibraryList:\r
if Sku.VariableGuid == '': continue\r
Sku.VariableGuidValue = GuidValue(Sku.VariableGuid, self.PackageList, self.MetaFile.Path)\r
if Sku.VariableGuidValue is None:\r
- PackageList = "\n\t".join([str(P) for P in self.PackageList])\r
+ PackageList = "\n\t".join(str(P) for P in self.PackageList)\r
EdkLogger.error(\r
'build',\r
RESOURCE_NOT_AVAILABLE,\r
for Depex in DepexList:\r
for key in Depex:\r
DepexStr += '[Depex.%s.%s]\n' % key\r
- DepexStr += '\n'.join(['# '+ val for val in Depex[key]])\r
+ DepexStr += '\n'.join('# '+ val for val in Depex[key])\r
DepexStr += '\n\n'\r
if not DepexStr:\r
return '[Depex.%s]\n' % self.Arch\r
DepexStr += ' AND '\r
DepexStr += '('\r
for D in Depex.values():\r
- DepexStr += ' '.join([val for val in D])\r
+ DepexStr += ' '.join(val for val in D)\r
Index = DepexStr.find('END')\r
if Index > -1 and Index == len(DepexStr) - 3:\r
DepexStr = DepexStr[:-3]\r
try:\r
newvaluestr = "{" + ",".join(VariableMgr.assemble_variable(newvalue)) +"}"\r
except:\r
- EdkLogger.error("build", AUTOGEN_ERROR, "Variable offset conflict in PCDs: %s \n" % (" and ".join([item.pcdname for item in sku_var_info_offset_list])))\r
+ EdkLogger.error("build", AUTOGEN_ERROR, "Variable offset conflict in PCDs: %s \n" % (" and ".join(item.pcdname for item in sku_var_info_offset_list)))\r
n = sku_var_info_offset_list[0]\r
indexedvarinfo[key] = [var_info(n.pcdindex,n.pcdname,n.defaultstoragename,n.skuname,n.var_name, n.var_guid, "0x00",n.var_attribute,newvaluestr , newvaluestr , DataType.TAB_VOID)]\r
self.VarInfo = [item[0] for item in indexedvarinfo.values()]\r
default_sku_default = indexedvarinfo[index].get((DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT))\r
\r
if default_sku_default.data_type not in DataType.TAB_PCD_NUMERIC_TYPES:\r
- var_max_len = max([len(var_item.default_value.split(",")) for var_item in sku_var_info.values()])\r
+ var_max_len = max(len(var_item.default_value.split(",")) for var_item in sku_var_info.values())\r
if len(default_sku_default.default_value.split(",")) < var_max_len:\r
- tail = ",".join([ "0x00" for i in range(var_max_len-len(default_sku_default.default_value.split(",")))])\r
+ tail = ",".join("0x00" for i in range(var_max_len-len(default_sku_default.default_value.split(","))))\r
\r
default_data_buffer = VariableMgr.PACK_VARIABLES_DATA(default_sku_default.default_value,default_sku_default.data_type,tail)\r
\r
\r
if default_sku_default.data_type not in DataType.TAB_PCD_NUMERIC_TYPES:\r
if len(other_sku_other.default_value.split(",")) < var_max_len:\r
- tail = ",".join([ "0x00" for i in range(var_max_len-len(other_sku_other.default_value.split(",")))])\r
+ tail = ",".join("0x00" for i in range(var_max_len-len(other_sku_other.default_value.split(","))))\r
\r
others_data_buffer = VariableMgr.PACK_VARIABLES_DATA(other_sku_other.default_value,other_sku_other.data_type,tail)\r
\r
def Append(self, AppendString, Dictionary=None):\r
if Dictionary:\r
SectionList = self._Parse(AppendString)\r
- self.String += "".join([S.Instantiate(Dictionary) for S in SectionList])\r
+ self.String += "".join(S.Instantiate(Dictionary) for S in SectionList)\r
else:\r
self.String += AppendString\r
\r
# @retval str The string replaced with placeholder values\r
#\r
def Replace(self, Dictionary=None):\r
- return "".join([S.Instantiate(Dictionary) for S in self._TemplateSectionList])\r
+ return "".join(S.Instantiate(Dictionary) for S in self._TemplateSectionList)\r
\r
## Progress indicator class\r
#\r
if not self.DefaultStores or "0" in self.DefaultStores:\r
return "0",TAB_DEFAULT_STORES_DEFAULT\r
else:\r
- minvalue = min([int(value_str) for value_str in self.DefaultStores])\r
+ minvalue = min(int(value_str) for value_str in self.DefaultStores)\r
return (str(minvalue), self.DefaultStores[str(minvalue)])\r
def GetMin(self,DefaultSIdList):\r
if not DefaultSIdList:\r
skuorderset.append(self.GetSkuChain(skuname))\r
\r
skuorder = []\r
- for index in range(max([len(item) for item in skuorderset])):\r
+ for index in range(max(len(item) for item in skuorderset)):\r
for subset in skuorderset:\r
if index > len(subset)-1:\r
continue\r
if isinstance(String, unicode):\r
if len(unicode) == 0:\r
return "{0x00,0x00}"\r
- return "{%s,0x00,0x00}" % ",".join(["0x%02x,0x00" % ord(C) for C in String])\r
+ return "{%s,0x00,0x00}" % ",".join("0x%02x,0x00" % ord(C) for C in String)\r
elif String.startswith('L"'):\r
if String == "L\"\"":\r
return "{0x00,0x00}"\r
else:\r
- return "{%s,0x00,0x00}" % ",".join(["0x%02x,0x00" % ord(C) for C in String[2:-1]])\r
+ return "{%s,0x00,0x00}" % ",".join("0x%02x,0x00" % ord(C) for C in String[2:-1])\r
elif String.startswith('"'):\r
if String == "\"\"":\r
return "{0x00,0x00}"\r
else:\r
StringLen = len(String[1:-1])\r
if StringLen % 2:\r
- return "{%s,0x00}" % ",".join(["0x%02x" % ord(C) for C in String[1:-1]])\r
+ return "{%s,0x00}" % ",".join("0x%02x" % ord(C) for C in String[1:-1])\r
else:\r
- return "{%s,0x00,0x00}" % ",".join(["0x%02x" % ord(C) for C in String[1:-1]])\r
+ return "{%s,0x00,0x00}" % ",".join("0x%02x" % ord(C) for C in String[1:-1])\r
elif String.startswith('{'):\r
StringLen = len(String.split(","))\r
if StringLen % 2:\r
- return "{%s,0x00}" % ",".join([ C.strip() for C in String[1:-1].split(',')])\r
+ return "{%s,0x00}" % ",".join(C.strip() for C in String[1:-1].split(','))\r
else:\r
- return "{%s}" % ",".join([ C.strip() for C in String[1:-1].split(',')])\r
+ return "{%s}" % ",".join(C.strip() for C in String[1:-1].split(','))\r
\r
else:\r
if len(String.split()) % 2:\r
## @file\r
# This file is used to create/update/query/erase table for files\r
#\r
-# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 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
self.ID = self.ID + self._ID_STEP_\r
if self.ID >= (self.IdBase + self._ID_MAX_):\r
self.ID = self.IdBase + self._ID_STEP_\r
- Values = ", ".join([str(Arg) for Arg in Args])\r
+ Values = ", ".join(str(Arg) for Arg in Args)\r
SqlCommand = "insert into %s values(%s, %s)" % (self.Table, self.ID, Values)\r
EdkLogger.debug(EdkLogger.DEBUG_5, SqlCommand)\r
self.Cur.execute(SqlCommand)\r
length = F.tell()\r
F.seek(4)\r
TmpStr = unpack('%dh' % ((length - 4) / 2), F.read())\r
- Name = ''.join([chr(c) for c in TmpStr[:-1]])\r
+ Name = ''.join(chr(c) for c in TmpStr[:-1])\r
else:\r
FileList = []\r
if 'fv.sec.txt' in MatchDict:\r
return len(Value) - 2\r
return len(Value)\r
\r
- return str(max([pcd_size for pcd_size in [get_length(item) for item in sku_values]]))\r
+ return str(max(get_length(item) for item in sku_values))\r
\r
@staticmethod\r
def ExecuteCommand (Command):\r
SearchPathList = []\r
SearchPathList.append(os.path.normpath(mws.join(GlobalData.gWorkspace, "BaseTools/Source/C/Include")))\r
SearchPathList.append(os.path.normpath(mws.join(GlobalData.gWorkspace, "BaseTools/Source/C/Common")))\r
- SearchPathList.extend([str(item) for item in IncSearchList])\r
+ SearchPathList.extend(str(item) for item in IncSearchList)\r
IncFileList = GetDependencyList(IncludeFileFullPaths,SearchPathList)\r
for include_file in IncFileList:\r
MakeApp += "$(OBJECTS) : %s\n" % include_file\r
if PcdType in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
for skuid in PcdObj.SkuInfoList:\r
skuobj = PcdObj.SkuInfoList[skuid]\r
- mindefaultstorename = DefaultStoreObj.GetMin(set([defaultstorename for defaultstorename in skuobj.DefaultStoreDict]))\r
+ mindefaultstorename = DefaultStoreObj.GetMin(set(defaultstorename for defaultstorename in skuobj.DefaultStoreDict))\r
for defaultstorename in DefaultStores:\r
if defaultstorename not in skuobj.DefaultStoreDict:\r
skuobj.DefaultStoreDict[defaultstorename] = copy.deepcopy(skuobj.DefaultStoreDict[mindefaultstorename])\r
CName = Record[0]\r
Value = ProtocolValue(CName, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of Protocol [%s] is not found under [Protocols] section in" % CName,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
CName = Record[0]\r
Value = PpiValue(CName, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of PPI [%s] is not found under [Ppis] section in " % CName,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
CName = Record[0]\r
Value = GuidValue(CName, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of Guid [%s] is not found under [Guids] section in" % CName,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
if Value is None:\r
Value = GuidValue(Token, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of [%s] is not found in" % Token,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
if TokenSpaceGuid not in self.Guids:\r
Value = GuidValue(TokenSpaceGuid, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of Guid [%s] is not found under [Guids] section in" % TokenSpaceGuid,\r
ExtraData=PackageList, File=self.MetaFile, Line=LineNo)\r
FORMAT_INVALID,\r
"PCD [%s.%s] in [%s] is not found in dependent packages:" % (TokenSpaceGuid, PcdRealName, self.MetaFile),\r
File=self.MetaFile, Line=LineNo,\r
- ExtraData="\t%s" % '\n\t'.join([str(P) for P in self.Packages])\r
+ ExtraData="\t%s" % '\n\t'.join(str(P) for P in self.Packages)\r
)\r
Pcds[PcdCName, TokenSpaceGuid] = Pcd\r
\r
## @file\r
# This file is used to create/update/query/erase table for files\r
#\r
-# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 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
self.ID = self.ID + self._ID_STEP_\r
if self.ID >= (self.IdBase + self._ID_MAX_):\r
self.ID = self.IdBase + self._ID_STEP_\r
- Values = ", ".join([str(Arg) for Arg in Args])\r
+ Values = ", ".join(str(Arg) for Arg in Args)\r
SqlCommand = "insert into %s values(%s, %s)" % (self.Table, self.ID, Values)\r
EdkLogger.debug(EdkLogger.DEBUG_5, SqlCommand)\r
self.Cur.execute(SqlCommand)\r
# while not BuildTask._ErrorFlag.isSet() and \\r
while len(BuildTask._RunningQueue) > 0:\r
EdkLogger.verbose("Waiting for thread ending...(%d)" % len(BuildTask._RunningQueue))\r
- EdkLogger.debug(EdkLogger.DEBUG_8, "Threads [%s]" % ", ".join([Th.getName() for Th in threading.enumerate()]))\r
+ EdkLogger.debug(EdkLogger.DEBUG_8, "Threads [%s]" % ", ".join(Th.getName() for Th in threading.enumerate()))\r
# avoid tense loop\r
time.sleep(0.1)\r
except BaseException, X:\r
projects / mirror_edk2.git / commitdiff