From nobody Sun Sep 7 12:25:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1529556306319562.5163296340489; Wed, 20 Jun 2018 21:45:06 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 97663211D56A6; Wed, 20 Jun 2018 21:44:42 -0700 (PDT) Received: from smtp.nue.novell.com (smtp.nue.novell.com [195.135.221.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 673EF211D5079 for ; Wed, 20 Jun 2018 21:44:39 -0700 (PDT) Received: from localhost.localdomain (unknown.telstraglobal.net [134.159.103.118]) by smtp.nue.novell.com with ESMTP (NOT encrypted); Thu, 21 Jun 2018 06:44:33 +0200 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=195.135.221.5; helo=smtp.nue.novell.com; envelope-from=glin@suse.com; receiver=edk2-devel@lists.01.org From: Gary Lin To: edk2-devel@lists.01.org Date: Thu, 21 Jun 2018 12:43:37 +0800 Message-Id: <20180621044346.28495-12-glin@suse.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621044346.28495-1-glin@suse.com> References: <20180621044346.28495-1-glin@suse.com> Subject: [edk2] [PATCH v3 11/20] BaseTools: Adjust the spaces around commas and colons X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Based on "futurize -f lib2to3.fixes.fix_ws_comma" Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py = | 2 +- BaseTools/Scripts/BinToPcd.py = | 6 +- BaseTools/Scripts/FormatDosFiles.py = | 2 +- BaseTools/Scripts/MemoryProfileSymbolGen.py = | 6 +- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxyge= n.py | 4 +- BaseTools/Scripts/PatchCheck.py = | 2 +- BaseTools/Scripts/RunMakefile.py = | 2 +- BaseTools/Source/Python/AutoGen/AutoGen.py = | 54 ++--- BaseTools/Source/Python/AutoGen/GenC.py = | 72 +++--- BaseTools/Source/Python/AutoGen/GenMake.py = | 4 +- BaseTools/Source/Python/AutoGen/GenPcdDb.py = | 114 +++++----- BaseTools/Source/Python/AutoGen/GenVar.py = | 160 +++++++------- BaseTools/Source/Python/AutoGen/StrGather.py = | 4 +- BaseTools/Source/Python/BPDG/GenVpd.py = | 12 +- BaseTools/Source/Python/Common/DataType.py = | 4 +- BaseTools/Source/Python/Common/Expression.py = | 10 +- BaseTools/Source/Python/Common/Misc.py = | 28 +-- BaseTools/Source/Python/Common/RangeExpression.py = | 6 +- BaseTools/Source/Python/Common/StringUtils.py = | 2 +- BaseTools/Source/Python/Common/ToolDefClassObject.py = | 6 +- BaseTools/Source/Python/Common/VpdInfoFile.py = | 10 +- BaseTools/Source/Python/Ecc/CParser.py = | 28 +-- BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py = | 16 +- BaseTools/Source/Python/Eot/CParser.py = | 28 +-- BaseTools/Source/Python/Eot/c.py = | 20 +- BaseTools/Source/Python/GenFds/AprioriSection.py = | 2 +- BaseTools/Source/Python/GenFds/CapsuleData.py = | 2 +- BaseTools/Source/Python/GenFds/EfiSection.py = | 6 +- BaseTools/Source/Python/GenFds/Fd.py = | 6 +- BaseTools/Source/Python/GenFds/FdfParser.py = | 26 +-- BaseTools/Source/Python/GenFds/FfsInfStatement.py = | 14 +- BaseTools/Source/Python/GenFds/Fv.py = | 4 +- BaseTools/Source/Python/GenFds/FvImageSection.py = | 4 +- BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py = | 4 +- BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py = | 2 +- BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py = | 2 +- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py = | 2 +- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py = | 6 +- BaseTools/Source/Python/TargetTool/TargetTool.py = | 12 +- BaseTools/Source/Python/Trim/Trim.py = | 14 +- BaseTools/Source/Python/UPT/Core/DependencyRules.py = | 8 +- BaseTools/Source/Python/UPT/Core/IpiDb.py = | 4 +- BaseTools/Source/Python/UPT/Library/StringUtils.py = | 2 +- BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py = | 2 +- BaseTools/Source/Python/UPT/UPT.py = | 2 +- BaseTools/Source/Python/UPT/Xml/CommonXml.py = | 2 +- BaseTools/Source/Python/UPT/Xml/XmlParser.py = | 24 +- BaseTools/Source/Python/Workspace/BuildClassObject.py = | 14 +- BaseTools/Source/Python/Workspace/DecBuildData.py = | 22 +- BaseTools/Source/Python/Workspace/DscBuildData.py = | 230 ++++++++++---------- BaseTools/Source/Python/Workspace/MetaFileParser.py = | 34 +-- BaseTools/Source/Python/Workspace/MetaFileTable.py = | 6 +- BaseTools/Source/Python/Workspace/WorkspaceCommon.py = | 2 +- BaseTools/Source/Python/build/BuildReport.py = | 10 +- BaseTools/Source/Python/build/build.py = | 12 +- BaseTools/Tests/TestTools.py = | 2 +- BaseTools/gcc/mingw-gcc-build.py = | 2 +- 57 files changed, 543 insertions(+), 543 deletions(-) diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py b/BaseTools/= Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py index dd66c7111ac0..b226499e8450 100755 --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py @@ -48,7 +48,7 @@ def ConvertCygPathToDos(CygPath): DosPath =3D CygPath =20 # pipes.quote will add the extra \\ for us. - return DosPath.replace('/','\\') + return DosPath.replace('/', '\\') =20 =20 # we receive our options as a list, but we will be passing them to the she= ll as a line diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py index 88c46c35aa33..154333617256 100644 --- a/BaseTools/Scripts/BinToPcd.py +++ b/BaseTools/Scripts/BinToPcd.py @@ -42,13 +42,13 @@ if __name__ =3D=3D '__main__': return Value =20 def ValidatePcdName (Argument): - if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*\.[a-zA-Z\_][a-zA-Z0-9\_]*',= Argument) !=3D ['','']: + if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*\.[a-zA-Z\_][a-zA-Z0-9\_]*',= Argument) !=3D ['', '']: Message =3D '{Argument} is not in the form .'.format (Argument =3D Argument) raise argparse.ArgumentTypeError (Message) return Argument =20 def ValidateGuidName (Argument): - if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) !=3D ['','']: + if re.split ('[a-zA-Z\_][a-zA-Z0-9\_]*', Argument) !=3D ['', '']: Message =3D '{Argument} is not a valid GUID C name'.format (Ar= gument =3D Argument) raise argparse.ArgumentTypeError (Message) return Argument @@ -85,7 +85,7 @@ if __name__ =3D=3D '__main__': help =3D "Output filename for PCD value or PCD st= atement") parser.add_argument ("-p", "--pcd", dest =3D 'PcdName', type =3D Valid= atePcdName, help =3D "Name of the PCD in the form .") - parser.add_argument ("-t", "--type", dest =3D 'PcdType', default =3D N= one, choices =3D ['VPD','HII'], + parser.add_argument ("-t", "--type", dest =3D 'PcdType', default =3D N= one, choices =3D ['VPD', 'HII'], help =3D "PCD statement type (HII or VPD). Defau= lt is standard.") parser.add_argument ("-m", "--max-size", dest =3D 'MaxSize', type =3D = ValidateUnsignedInteger, help =3D "Maximum size of the PCD. Ignored with = --type HII.") diff --git a/BaseTools/Scripts/FormatDosFiles.py b/BaseTools/Scripts/Format= DosFiles.py index ce9d829ee430..5b7f43ef4ba6 100644 --- a/BaseTools/Scripts/FormatDosFiles.py +++ b/BaseTools/Scripts/FormatDosFiles.py @@ -63,7 +63,7 @@ def FormatFilesInDir(DirPath, ExtList, Args): FormatFile(File, Args) =20 if __name__ =3D=3D "__main__": - parser =3D argparse.ArgumentParser(prog=3D__prog__,description=3D__des= cription__ + __copyright__, conflict_handler =3D 'resolve') + parser =3D argparse.ArgumentParser(prog=3D__prog__, description=3D__de= scription__ + __copyright__, conflict_handler =3D 'resolve') =20 parser.add_argument('Path', nargs=3D'+', help=3D'the path for files to be converted.It coul= d be directory or file path.') diff --git a/BaseTools/Scripts/MemoryProfileSymbolGen.py b/BaseTools/Script= s/MemoryProfileSymbolGen.py index 0a41f9d83271..1dbb116bba0d 100644 --- a/BaseTools/Scripts/MemoryProfileSymbolGen.py +++ b/BaseTools/Scripts/MemoryProfileSymbolGen.py @@ -191,7 +191,7 @@ def processLine(newline): =20 driverPrefixLen =3D len("Driver - ") # get driver name - if cmp(newline[0:driverPrefixLen],"Driver - ") =3D=3D 0 : + if cmp(newline[0:driverPrefixLen], "Driver - ") =3D=3D 0 : driverlineList =3D newline.split(" ") driverName =3D driverlineList[2] #print "Checking : ", driverName @@ -214,7 +214,7 @@ def processLine(newline): else : symbolsFile.symbolsTable[driverName].parse_debug_file (driverN= ame, pdbName) =20 - elif cmp(newline,"") =3D=3D 0 : + elif cmp(newline, "") =3D=3D 0 : driverName =3D "" =20 # check entry line @@ -227,7 +227,7 @@ def processLine(newline): rvaName =3D "" symbolName =3D "" =20 - if cmp(rvaName,"") =3D=3D 0 : + if cmp(rvaName, "") =3D=3D 0 : return newline else : return newline + symbolName diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/doxygen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugin= s/basemodel/doxygen.py index fe2ba1d8a842..b5ab213cd7f0 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/d= oxygen.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/d= oxygen.py @@ -66,7 +66,7 @@ class Page(BaseDoxygeItem): =20 def AddSection(self, section): self.mSections.append(section) - self.mSections.sort(cmp=3Dlambda x,y: cmp(x.mName.lower(), y.mName= .lower())) + self.mSections.sort(cmp=3Dlambda x, y: cmp(x.mName.lower(), y.mNam= e.lower())) =20 def Generate(self): if self.mIsMainPage: @@ -91,7 +91,7 @@ class Page(BaseDoxygeItem): self.mText.insert(endIndex, '
    ') endIndex +=3D 1 if self.mIsSort: - self.mSubPages.sort(cmp=3Dlambda x,y: cmp(x.mName.lower(),= y.mName.lower())) + self.mSubPages.sort(cmp=3Dlambda x, y: cmp(x.mName.lower()= , y.mName.lower())) for page in self.mSubPages: self.mText.insert(endIndex, '
  • \subpage %s \"%s\"
    • '= % (page.mTag, page.mName)) endIndex +=3D 1 diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck= .py index 51d4adf08b60..211db566cb25 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -286,7 +286,7 @@ class GitDiffCheck: if self.state =3D=3D START: if line.startswith('diff --git'): self.state =3D PRE_PATCH - self.filename =3D line[13:].split(' ',1)[0] + self.filename =3D line[13:].split(' ', 1)[0] self.is_newfile =3D False self.force_crlf =3D not self.filename.endswith('.sh') elif len(line.rstrip()) !=3D 0: diff --git a/BaseTools/Scripts/RunMakefile.py b/BaseTools/Scripts/RunMakefi= le.py index 48bc198c7671..6d0c4553c9eb 100644 --- a/BaseTools/Scripts/RunMakefile.py +++ b/BaseTools/Scripts/RunMakefile.py @@ -149,7 +149,7 @@ if __name__ =3D=3D '__main__': for Item in gArgs.Define: if '=3D' not in Item[0]: continue - Item =3D Item[0].split('=3D',1) + Item =3D Item[0].split('=3D', 1) CommandLine.append('%s=3D"%s"' % (Item[0], Item[1])) CommandLine.append('EXTRA_FLAGS=3D"%s"' % (gArgs.Remaining)) CommandLine.append(gArgs.BuildType) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index 5626261b2cee..94c5b80cb23b 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -49,7 +49,7 @@ from Common.MultipleWorkspace import MultipleWorkspace as= mws import InfSectionParser import datetime import hashlib -from GenVar import VariableMgr,var_info +from GenVar import VariableMgr, var_info from collections import OrderedDict from collections import defaultdict from Workspace.WorkspaceCommon import OrderedListDict @@ -1294,7 +1294,7 @@ class PlatformAutoGen(AutoGen): ShareFixedAtBuildPcdsSameValue =3D {}=20 for Module in LibAuto._ReferenceModules: =20 for Pcd in Module.FixedAtBuildPcds + LibAuto.FixedAtBuildP= cds: - key =3D ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCNa= me)) =20 + key =3D ".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCN= ame)) if key not in FixedAtBuildPcds: ShareFixedAtBuildPcdsSameValue[key] =3D True FixedAtBuildPcds[key] =3D Pcd.DefaultValue @@ -1302,11 +1302,11 @@ class PlatformAutoGen(AutoGen): if FixedAtBuildPcds[key] !=3D Pcd.DefaultValue: ShareFixedAtBuildPcdsSameValue[key] =3D False = =20 for Pcd in LibAuto.FixedAtBuildPcds: - key =3D ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName)) - if (Pcd.TokenCName,Pcd.TokenSpaceGuidCName) not in self.No= nDynamicPcdDict: + key =3D ".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName)) + if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) not in self.N= onDynamicPcdDict: continue else: - DscPcd =3D self.NonDynamicPcdDict[(Pcd.TokenCName,Pcd.= TokenSpaceGuidCName)] + DscPcd =3D self.NonDynamicPcdDict[(Pcd.TokenCName, Pcd= .TokenSpaceGuidCName)] if DscPcd.Type !=3D TAB_PCDS_FIXED_AT_BUILD: continue if key in ShareFixedAtBuildPcdsSameValue and ShareFixedAtB= uildPcdsSameValue[key]: =20 @@ -1326,12 +1326,12 @@ class PlatformAutoGen(AutoGen): break =20 =20 - VariableInfo =3D VariableMgr(self.DscBuildDataObj._GetDefaultStore= s(),self.DscBuildDataObj._GetSkuIds()) + VariableInfo =3D VariableMgr(self.DscBuildDataObj._GetDefaultStore= s(), self.DscBuildDataObj._GetSkuIds()) VariableInfo.SetVpdRegionMaxSize(VpdRegionSize) VariableInfo.SetVpdRegionOffset(VpdRegionBase) Index =3D 0 for Pcd in DynamicPcdSet: - pcdname =3D ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName)) + pcdname =3D ".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName)) for SkuName in Pcd.SkuInfoList: Sku =3D Pcd.SkuInfoList[SkuName] SkuId =3D Sku.SkuId @@ -1341,11 +1341,11 @@ class PlatformAutoGen(AutoGen): VariableGuidStructure =3D Sku.VariableGuidValue VariableGuid =3D GuidStructureStringToGuidString(Varia= bleGuidStructure) for StorageName in Sku.DefaultStoreDict: - VariableInfo.append_variable(var_info(Index,pcdnam= e,StorageName,SkuName, StringToArray(Sku.VariableName),VariableGuid, Sku.Va= riableOffset, Sku.VariableAttribute , Sku.HiiDefaultValue,Sku.DefaultStoreD= ict[StorageName],Pcd.DatumType)) + VariableInfo.append_variable(var_info(Index, pcdna= me, StorageName, SkuName, StringToArray(Sku.VariableName), VariableGuid, Sk= u.VariableOffset, Sku.VariableAttribute, Sku.HiiDefaultValue, Sku.DefaultSt= oreDict[StorageName], Pcd.DatumType)) Index +=3D 1 return VariableInfo =20 - def UpdateNVStoreMaxSize(self,OrgVpdFile): + def UpdateNVStoreMaxSize(self, OrgVpdFile): if self.VariableInfo: VpdMapFilePath =3D os.path.join(self.BuildDir, TAB_FV_DIRECTOR= Y, "%s.map" % self.Platform.VpdToolGuid) PcdNvStoreDfBuffer =3D [item for item in self._DynamicPcdList = if item.TokenCName =3D=3D "PcdNvStoreDefaultValueBuffer" and item.TokenSpac= eGuidCName =3D=3D "gEfiMdeModulePkgTokenSpaceGuid"] @@ -1358,7 +1358,7 @@ class PlatformAutoGen(AutoGen): else: EdkLogger.error("build", FILE_READ_FAILURE, "Can not f= ind VPD map file %s to fix up VPD offset." % VpdMapFilePath) =20 - NvStoreOffset =3D int(NvStoreOffset,16) if NvStoreOffset.u= pper().startswith("0X") else int(NvStoreOffset) + NvStoreOffset =3D int(NvStoreOffset, 16) if NvStoreOffset.= upper().startswith("0X") else int(NvStoreOffset) default_skuobj =3D PcdNvStoreDfBuffer[0].SkuInfoList.get(T= AB_DEFAULT) maxsize =3D self.VariableInfo.VpdRegionSize - NvStoreOffs= et if self.VariableInfo.VpdRegionSize else len(default_skuobj.DefaultValue.= split(",")) var_data =3D self.VariableInfo.PatchNVStoreDefaultMaxSize(= maxsize) @@ -1570,7 +1570,7 @@ class PlatformAutoGen(AutoGen): VpdPcdDict[(Pcd.TokenCName, Pcd.TokenSpaceGuidCName)] = =3D Pcd =20 #Collect DynamicHii PCD values and assign it to DynamicExVpd P= CD gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer - PcdNvStoreDfBuffer =3D VpdPcdDict.get(("PcdNvStoreDefaultValue= Buffer","gEfiMdeModulePkgTokenSpaceGuid")) + PcdNvStoreDfBuffer =3D VpdPcdDict.get(("PcdNvStoreDefaultValue= Buffer", "gEfiMdeModulePkgTokenSpaceGuid")) if PcdNvStoreDfBuffer: self.VariableInfo =3D self.CollectVariables(self._DynamicP= cdList) vardump =3D self.VariableInfo.dump() @@ -1596,10 +1596,10 @@ class PlatformAutoGen(AutoGen): PcdValue =3D DefaultSku.DefaultValue if PcdValue not in SkuValueMap: SkuValueMap[PcdValue] =3D [] - VpdFile.Add(Pcd, TAB_DEFAULT,DefaultSku.VpdOff= set) + VpdFile.Add(Pcd, TAB_DEFAULT, DefaultSku.VpdOf= fset) SkuValueMap[PcdValue].append(DefaultSku) =20 - for (SkuName,Sku) in Pcd.SkuInfoList.items(): + for (SkuName, Sku) in Pcd.SkuInfoList.items(): Sku.VpdOffset =3D Sku.VpdOffset.strip() PcdValue =3D Sku.DefaultValue if PcdValue =3D=3D "": @@ -1625,7 +1625,7 @@ class PlatformAutoGen(AutoGen): EdkLogger.error("build", FORMAT_INVALI= D, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (Pcd.TokenS= paceGuidCName, Pcd.TokenCName, Alignment)) if PcdValue not in SkuValueMap: SkuValueMap[PcdValue] =3D [] - VpdFile.Add(Pcd, SkuName,Sku.VpdOffset) + VpdFile.Add(Pcd, SkuName, Sku.VpdOffset) SkuValueMap[PcdValue].append(Sku) # if the offset of a VPD is *, then it need to be = fixed up by third party tool. if not NeedProcessVpdMapFile and Sku.VpdOffset =3D= =3D "*": @@ -1657,9 +1657,9 @@ class PlatformAutoGen(AutoGen): SkuObjList =3D DscPcdEntry.SkuInfoList.items() DefaultSku =3D DscPcdEntry.SkuInfoList.get(TAB= _DEFAULT) if DefaultSku: - defaultindex =3D SkuObjList.index((TAB_DEF= AULT,DefaultSku)) - SkuObjList[0],SkuObjList[defaultindex] =3D= SkuObjList[defaultindex],SkuObjList[0] - for (SkuName,Sku) in SkuObjList: + defaultindex =3D SkuObjList.index((TAB_DEF= AULT, DefaultSku)) + SkuObjList[0], SkuObjList[defaultindex] = =3D SkuObjList[defaultindex], SkuObjList[0] + for (SkuName, Sku) in SkuObjList: Sku.VpdOffset =3D Sku.VpdOffset.strip()=20 =20 # Need to iterate DEC pcd information to g= et the value & datumtype @@ -1709,7 +1709,7 @@ class PlatformAutoGen(AutoGen): EdkLogger.error("build", FORMA= T_INVALID, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (Ds= cPcdEntry.TokenSpaceGuidCName, DscPcdEntry.TokenCName, Alignment)) if PcdValue not in SkuValueMap: SkuValueMap[PcdValue] =3D [] - VpdFile.Add(DscPcdEntry, SkuName,Sku.V= pdOffset) + VpdFile.Add(DscPcdEntry, SkuName, Sku.= VpdOffset) SkuValueMap[PcdValue].append(Sku) if not NeedProcessVpdMapFile and Sku.VpdOf= fset =3D=3D "*": NeedProcessVpdMapFile =3D True=20 @@ -1775,17 +1775,17 @@ class PlatformAutoGen(AutoGen): self._DynamicPcdList.extend(list(UnicodePcdArray)) self._DynamicPcdList.extend(list(HiiPcdArray)) self._DynamicPcdList.extend(list(OtherPcdArray)) - allskuset =3D [(SkuName,Sku.SkuId) for pcd in self._DynamicPcdList= for (SkuName,Sku) in pcd.SkuInfoList.items()] + allskuset =3D [(SkuName, Sku.SkuId) for pcd in self._DynamicPcdLis= t for (SkuName, Sku) in pcd.SkuInfoList.items()] for pcd in self._DynamicPcdList: if len(pcd.SkuInfoList) =3D=3D 1: - for (SkuName,SkuId) in allskuset: - if type(SkuId) in (str,unicode) and eval(SkuId) =3D=3D= 0 or SkuId =3D=3D 0: + for (SkuName, SkuId) in allskuset: + if type(SkuId) in (str, unicode) and eval(SkuId) =3D= =3D 0 or SkuId =3D=3D 0: continue pcd.SkuInfoList[SkuName] =3D copy.deepcopy(pcd.SkuInfo= List[TAB_DEFAULT]) pcd.SkuInfoList[SkuName].SkuId =3D SkuId self.AllPcdList =3D self._NonDynamicPcdList + self._DynamicPcdList =20 - def FixVpdOffset(self,VpdFile ): + def FixVpdOffset(self, VpdFile ): FvPath =3D os.path.join(self.BuildDir, TAB_FV_DIRECTORY) if not os.path.exists(FvPath): try: @@ -2051,7 +2051,7 @@ class PlatformAutoGen(AutoGen): if self._NonDynamicPcdDict: return self._NonDynamicPcdDict for Pcd in self.NonDynamicPcdList: - self._NonDynamicPcdDict[(Pcd.TokenCName,Pcd.TokenSpaceGuidCNam= e)] =3D Pcd + self._NonDynamicPcdDict[(Pcd.TokenCName, Pcd.TokenSpaceGuidCNa= me)] =3D Pcd return self._NonDynamicPcdDict =20 ## Get list of non-dynamic PCDs @@ -3712,7 +3712,7 @@ class ModuleAutoGen(AutoGen): try: fInputfile =3D open(UniVfrOffsetFileName, "wb+", 0) except: - EdkLogger.error("build", FILE_OPEN_FAILURE, "File open failed = for %s" % UniVfrOffsetFileName,None) + EdkLogger.error("build", FILE_OPEN_FAILURE, "File open failed = for %s" % UniVfrOffsetFileName, None) =20 # Use a instance of StringIO to cache data fStringIO =3D StringIO('') =20 @@ -3747,7 +3747,7 @@ class ModuleAutoGen(AutoGen): fInputfile.write (fStringIO.getvalue()) except: EdkLogger.error("build", FILE_WRITE_FAILURE, "Write data to fi= le %s failed, please check whether the " - "file been locked or using by other applicatio= ns." %UniVfrOffsetFileName,None) + "file been locked or using by other applicatio= ns." %UniVfrOffsetFileName, None) =20 fStringIO.close () fInputfile.close () @@ -4182,7 +4182,7 @@ class ModuleAutoGen(AutoGen): def CopyBinaryFiles(self): for File in self.Module.Binaries: SrcPath =3D File.Path - DstPath =3D os.path.join(self.OutputDir , os.path.basename(Src= Path)) + DstPath =3D os.path.join(self.OutputDir, os.path.basename(SrcP= ath)) CopyLongFilePath(SrcPath, DstPath) ## Create autogen code for the module and its dependent libraries # @@ -4332,7 +4332,7 @@ class ModuleAutoGen(AutoGen): if SrcTimeStamp > DstTimeStamp: return False =20 - with open(self.GetTimeStampPath(),'r') as f: + with open(self.GetTimeStampPath(), 'r') as f: for source in f: source =3D source.rstrip('\n') if not os.path.exists(source): diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Pyt= hon/AutoGen/GenC.py index 2f10b3787a2d..b0af4bc88d97 100644 --- a/BaseTools/Source/Python/AutoGen/GenC.py +++ b/BaseTools/Source/Python/AutoGen/GenC.py @@ -950,7 +950,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd): AutoGenH.Append('// Disabled the macros, as PcdToken and PcdGe= t/Set are not allowed in the case that more than one DynamicEx Pcds are dif= ferent Guids but same CName.\n') AutoGenH.Append('// #define %s %s\n' % (PcdTokenName, PcdExTo= kenName)) AutoGenH.Append('// #define %s LibPcdGetEx%s(&%s, %s)\n' % (G= etModeName, DatumSizeLib, Pcd.TokenSpaceGuidCName, PcdTokenName)) - AutoGenH.Append('// #define %s LibPcdGetExSize(&%s, %s)\n' % = (GetModeSizeName,Pcd.TokenSpaceGuidCName, PcdTokenName)) + AutoGenH.Append('// #define %s LibPcdGetExSize(&%s, %s)\n' % = (GetModeSizeName, Pcd.TokenSpaceGuidCName, PcdTokenName)) if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES: AutoGenH.Append('// #define %s(SizeOfBuffer, Buffer) LibP= cdSetEx%s(&%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeName, DatumSizeLi= b, Pcd.TokenSpaceGuidCName, PcdTokenName)) AutoGenH.Append('// #define %s(SizeOfBuffer, Buffer) LibP= cdSetEx%sS(&%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeStatusName, Datu= mSizeLib, Pcd.TokenSpaceGuidCName, PcdTokenName)) @@ -960,7 +960,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd): else: AutoGenH.Append('#define %s %s\n' % (PcdTokenName, PcdExToken= Name)) AutoGenH.Append('#define %s LibPcdGetEx%s(&%s, %s)\n' % (GetM= odeName, DatumSizeLib, Pcd.TokenSpaceGuidCName, PcdTokenName)) - AutoGenH.Append('#define %s LibPcdGetExSize(&%s, %s)\n' % (Get= ModeSizeName,Pcd.TokenSpaceGuidCName, PcdTokenName)) + AutoGenH.Append('#define %s LibPcdGetExSize(&%s, %s)\n' % (Get= ModeSizeName, Pcd.TokenSpaceGuidCName, PcdTokenName)) if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES: AutoGenH.Append('#define %s(SizeOfBuffer, Buffer) LibPcdS= etEx%s(&%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeName, DatumSizeLib, = Pcd.TokenSpaceGuidCName, PcdTokenName)) AutoGenH.Append('#define %s(SizeOfBuffer, Buffer) LibPcdS= etEx%sS(&%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeStatusName, DatumSi= zeLib, Pcd.TokenSpaceGuidCName, PcdTokenName)) @@ -1074,7 +1074,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd= ): Value =3D eval(Value) # translate escape character ValueSize =3D len(Value) + 1 NewValue =3D '{' - for Index in range(0,len(Value)): + for Index in range(0, len(Value)): if Unicode: NewValue =3D NewValue + str(ord(Value[Index]) % 0x= 10000) + ', ' else: @@ -1120,14 +1120,14 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, P= cd): PcdDataSize =3D Pcd.GetPcdSize() if Pcd.Type =3D=3D TAB_PCDS_FIXED_AT_BUILD: AutoGenH.Append('#define %s %s\n' % (FixPcdSizeTokenName, = PcdDataSize)) - AutoGenH.Append('#define %s %s \n' % (GetModeSizeName,Fix= PcdSizeTokenName)) - AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED const UINTN= %s =3D %s;\n' % (FixedPcdSizeVariableName,PcdDataSize)) + AutoGenH.Append('#define %s %s \n' % (GetModeSizeName, Fi= xPcdSizeTokenName)) + AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED const UINTN= %s =3D %s;\n' % (FixedPcdSizeVariableName, PcdDataSize)) if Pcd.Type =3D=3D TAB_PCDS_PATCHABLE_IN_MODULE: AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName= , Pcd.MaxDatumSize)) - AutoGenH.Append('#define %s %s \n' % (GetModeSizeName,Pat= chPcdSizeVariableName)) + AutoGenH.Append('#define %s %s \n' % (GetModeSizeName, Pa= tchPcdSizeVariableName)) AutoGenH.Append('extern UINTN %s; \n' % PatchPcdSizeVariab= leName) - AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED UINTN %s = =3D %s;\n' % (PatchPcdSizeVariableName,PcdDataSize)) - AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED const UINTN= %s =3D %s;\n' % (PatchPcdMaxSizeVariable,Pcd.MaxDatumSize)) + AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED UINTN %s = =3D %s;\n' % (PatchPcdSizeVariableName, PcdDataSize)) + AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED const UINTN= %s =3D %s;\n' % (PatchPcdMaxSizeVariable, Pcd.MaxDatumSize)) elif Pcd.Type =3D=3D TAB_PCDS_PATCHABLE_IN_MODULE: AutoGenH.Append('#define %s %s\n' %(PcdValueName, Value)) AutoGenC.Append('volatile %s %s %s =3D %s;\n' %(Const, Pcd.Dat= umType, PcdVariableName, PcdValueName)) @@ -1137,13 +1137,13 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, P= cd): PcdDataSize =3D Pcd.GetPcdSize() AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName, Pc= dDataSize)) =20 - AutoGenH.Append('#define %s %s \n' % (GetModeSizeName,PatchPc= dSizeVariableName)) + AutoGenH.Append('#define %s %s \n' % (GetModeSizeName, PatchP= cdSizeVariableName)) AutoGenH.Append('extern UINTN %s; \n' % PatchPcdSizeVariableNa= me) - AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED UINTN %s =3D %s= ;\n' % (PatchPcdSizeVariableName,PcdDataSize)) + AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED UINTN %s =3D %s= ;\n' % (PatchPcdSizeVariableName, PcdDataSize)) else: PcdDataSize =3D Pcd.GetPcdSize() AutoGenH.Append('#define %s %s\n' % (FixPcdSizeTokenName, PcdD= ataSize)) - AutoGenH.Append('#define %s %s \n' % (GetModeSizeName,FixPcdS= izeTokenName)) + AutoGenH.Append('#define %s %s \n' % (GetModeSizeName, FixPcd= SizeTokenName)) =20 AutoGenH.Append('#define %s %s\n' %(PcdValueName, Value)) AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED %s %s %s =3D %s= ;\n' %(Const, Pcd.DatumType, PcdVariableName, PcdValueName)) @@ -1250,7 +1250,7 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pc= d): AutoGenH.Append('// Disabled the macros, as PcdToken and PcdGe= t/Set are not allowed in the case that more than one DynamicEx Pcds are dif= ferent Guids but same CName.\n') AutoGenH.Append('// #define %s %s\n' % (PcdTokenName, PcdExTo= kenName)) AutoGenH.Append('// #define %s LibPcdGetEx%s(&%s, %s)\n' % (G= etModeName, DatumSizeLib, Pcd.TokenSpaceGuidCName, PcdTokenName)) - AutoGenH.Append('// #define %s LibPcdGetExSize(&%s, %s)\n' % = (GetModeSizeName,Pcd.TokenSpaceGuidCName, PcdTokenName)) + AutoGenH.Append('// #define %s LibPcdGetExSize(&%s, %s)\n' % = (GetModeSizeName, Pcd.TokenSpaceGuidCName, PcdTokenName)) if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES: AutoGenH.Append('// #define %s(SizeOfBuffer, Buffer) LibP= cdSetEx%s(&%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeName, DatumSizeLi= b, Pcd.TokenSpaceGuidCName, PcdTokenName)) AutoGenH.Append('// #define %s(SizeOfBuffer, Buffer) LibP= cdSetEx%sS(&%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeStatusName, Datu= mSizeLib, Pcd.TokenSpaceGuidCName, PcdTokenName)) @@ -1260,7 +1260,7 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pc= d): else: AutoGenH.Append('#define %s %s\n' % (PcdTokenName, PcdExToken= Name)) AutoGenH.Append('#define %s LibPcdGetEx%s(&%s, %s)\n' % (GetM= odeName, DatumSizeLib, Pcd.TokenSpaceGuidCName, PcdTokenName)) - AutoGenH.Append('#define %s LibPcdGetExSize(&%s, %s)\n' % (Get= ModeSizeName,Pcd.TokenSpaceGuidCName, PcdTokenName)) + AutoGenH.Append('#define %s LibPcdGetExSize(&%s, %s)\n' % (Get= ModeSizeName, Pcd.TokenSpaceGuidCName, PcdTokenName)) if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES: AutoGenH.Append('#define %s(SizeOfBuffer, Buffer) LibPcdS= etEx%s(&%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeName, DatumSizeLib, = Pcd.TokenSpaceGuidCName, PcdTokenName)) AutoGenH.Append('#define %s(SizeOfBuffer, Buffer) LibPcdS= etEx%sS(&%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeStatusName, DatumSi= zeLib, Pcd.TokenSpaceGuidCName, PcdTokenName)) @@ -1311,11 +1311,11 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, = Pcd): AutoGenH.Append('#define %s(Value) ((%s =3D (Value)), RETURN_= SUCCESS)\n' % (SetModeStatusName, PcdVariableName)) AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName, Pc= dDataSize)) =20 - AutoGenH.Append('#define %s %s\n' % (GetModeSizeName,PatchPcdSizeV= ariableName)) + AutoGenH.Append('#define %s %s\n' % (GetModeSizeName, PatchPcdSize= VariableName)) AutoGenH.Append('extern UINTN %s; \n' % PatchPcdSizeVariableName) =20 if PcdItemType =3D=3D TAB_PCDS_FIXED_AT_BUILD or PcdItemType =3D=3D TA= B_PCDS_FEATURE_FLAG: - key =3D ".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName)) + key =3D ".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName)) PcdVariableName =3D '_gPcd_' + gItemTypeStringDatabase[Pcd.Type] += '_' + TokenCName if DatumType =3D=3D TAB_VOID and Array =3D=3D '[]': DatumType =3D [TAB_UINT8, TAB_UINT16][Pcd.DefaultValue[0] =3D= =3D 'L'] @@ -1339,14 +1339,14 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, = Pcd): if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES: if ConstFixedPcd: AutoGenH.Append('#define %s %s\n' % (FixPcdSizeTokenNa= me, PcdDataSize)) - AutoGenH.Append('#define %s %s\n' % (GetModeSizeName,F= ixPcdSizeTokenName)) + AutoGenH.Append('#define %s %s\n' % (GetModeSizeName, = FixPcdSizeTokenName)) else: - AutoGenH.Append('#define %s %s\n' % (GetModeSizeName,F= ixedPcdSizeVariableName)) - AutoGenH.Append('#define %s %s\n' % (FixPcdSizeTokenNa= me,FixedPcdSizeVariableName)) + AutoGenH.Append('#define %s %s\n' % (GetModeSizeName, = FixedPcdSizeVariableName)) + AutoGenH.Append('#define %s %s\n' % (FixPcdSizeTokenNa= me, FixedPcdSizeVariableName)) AutoGenH.Append('extern const UINTN %s; \n' % FixedPcd= SizeVariableName) else: AutoGenH.Append('#define %s %s\n' % (FixPcdSizeTokenName, = PcdDataSize)) - AutoGenH.Append('#define %s %s\n' % (GetModeSizeName,FixPc= dSizeTokenName)) + AutoGenH.Append('#define %s %s\n' % (GetModeSizeName, FixP= cdSizeTokenName)) =20 ## Create code for library constructor # @@ -1374,11 +1374,11 @@ def CreateLibraryConstructorCode(Info, AutoGenC, Au= toGenH): elif Lib.ModuleType in SUP_MODULE_SET_PEI: ConstructorPrototypeString.Append(gLibraryStructorPrototype['P= EI'].Replace(Dict)) ConstructorCallingString.Append(gLibraryStructorCall['PEI'].Re= place(Dict)) - elif Lib.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,= SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER, - SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI_= DRIVER,SUP_MODULE_UEFI_APPLICATION,SUP_MODULE_SMM_CORE]: + elif Lib.ModuleType in [SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVER= , SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER, + SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEFI= _DRIVER, SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_SMM_CORE]: ConstructorPrototypeString.Append(gLibraryStructorPrototype['D= XE'].Replace(Dict)) ConstructorCallingString.Append(gLibraryStructorCall['DXE'].Re= place(Dict)) - elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE,SUP_MODULE_MM_COR= E_STANDALONE]: + elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CO= RE_STANDALONE]: ConstructorPrototypeString.Append(gLibraryStructorPrototype['M= M'].Replace(Dict)) ConstructorCallingString.Append(gLibraryStructorCall['MM'].Rep= lace(Dict)) =20 @@ -1403,10 +1403,10 @@ def CreateLibraryConstructorCode(Info, AutoGenC, Au= toGenH): AutoGenC.Append(gLibraryString[SUP_MODULE_BASE].Replace(Dict)) elif Info.ModuleType in SUP_MODULE_SET_PEI: AutoGenC.Append(gLibraryString['PEI'].Replace(Dict)) - elif Info.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER= ,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER, - SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI= _DRIVER,SUP_MODULE_UEFI_APPLICATION,SUP_MODULE_SMM_CORE]: + elif Info.ModuleType in [SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVE= R, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER, + SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEF= I_DRIVER, SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_SMM_CORE]: AutoGenC.Append(gLibraryString['DXE'].Replace(Dict)) - elif Info.ModuleType in [SUP_MODULE_MM_STANDALONE,SUP_MODULE_MM_CO= RE_STANDALONE]: + elif Info.ModuleType in [SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_C= ORE_STANDALONE]: AutoGenC.Append(gLibraryString['MM'].Replace(Dict)) =20 ## Create code for library destructor @@ -1436,11 +1436,11 @@ def CreateLibraryDestructorCode(Info, AutoGenC, Aut= oGenH): elif Lib.ModuleType in SUP_MODULE_SET_PEI: DestructorPrototypeString.Append(gLibraryStructorPrototype['PE= I'].Replace(Dict)) DestructorCallingString.Append(gLibraryStructorCall['PEI'].Rep= lace(Dict)) - elif Lib.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,= SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER, - SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI_= DRIVER,SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_SMM_CORE]: + elif Lib.ModuleType in [SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVER= , SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER, + SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEFI= _DRIVER, SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_SMM_CORE]: DestructorPrototypeString.Append(gLibraryStructorPrototype['DX= E'].Replace(Dict)) DestructorCallingString.Append(gLibraryStructorCall['DXE'].Rep= lace(Dict)) - elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE,SUP_MODULE_MM_COR= E_STANDALONE]: + elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CO= RE_STANDALONE]: DestructorPrototypeString.Append(gLibraryStructorPrototype['MM= '].Replace(Dict)) DestructorCallingString.Append(gLibraryStructorCall['MM'].Repl= ace(Dict)) =20 @@ -1465,10 +1465,10 @@ def CreateLibraryDestructorCode(Info, AutoGenC, Aut= oGenH): AutoGenC.Append(gLibraryString[SUP_MODULE_BASE].Replace(Dict)) elif Info.ModuleType in SUP_MODULE_SET_PEI: AutoGenC.Append(gLibraryString['PEI'].Replace(Dict)) - elif Info.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER= ,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER, - SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI= _DRIVER,SUP_MODULE_UEFI_APPLICATION,SUP_MODULE_SMM_CORE]: + elif Info.ModuleType in [SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVE= R, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER, + SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEF= I_DRIVER, SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_SMM_CORE]: AutoGenC.Append(gLibraryString['DXE'].Replace(Dict)) - elif Info.ModuleType in [SUP_MODULE_MM_STANDALONE,SUP_MODULE_MM_CO= RE_STANDALONE]: + elif Info.ModuleType in [SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_C= ORE_STANDALONE]: AutoGenC.Append(gLibraryString['MM'].Replace(Dict)) =20 =20 @@ -1527,7 +1527,7 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGe= nH): else: AutoGenC.Append(gPeimEntryPointString[2].Replace(Dict)) AutoGenH.Append(gPeimEntryPointPrototype.Replace(Dict)) - elif Info.ModuleType in [SUP_MODULE_DXE_RUNTIME_DRIVER,SUP_MODULE_DXE_= DRIVER,SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI_DRIVER]: + elif Info.ModuleType in [SUP_MODULE_DXE_RUNTIME_DRIVER, SUP_MODULE_DXE= _DRIVER, SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEFI_DRIVER]: if NumEntryPoints < 2: AutoGenC.Append(gUefiDriverEntryPointString[NumEntryPoints].Re= place(Dict)) else: @@ -1926,7 +1926,7 @@ def BmpImageDecoder(File, Buffer, PaletteIndex, Trans= Parent): ImageType, =3D struct.unpack('2s', Buffer[0:2]) if ImageType!=3D 'BM': # BMP file type is 'BM' EdkLogger.error("build", FILE_TYPE_MISMATCH, "The file %s is not a= standard BMP file." % File.Path) - BMP_IMAGE_HEADER =3D collections.namedtuple('BMP_IMAGE_HEADER', ['bfSi= ze','bfReserved1','bfReserved2','bfOffBits','biSize','biWidth','biHeight','= biPlanes','biBitCount', 'biCompression', 'biSizeImage','biXPelsPerMeter','b= iYPelsPerMeter','biClrUsed','biClrImportant']) + BMP_IMAGE_HEADER =3D collections.namedtuple('BMP_IMAGE_HEADER', ['bfSi= ze', 'bfReserved1', 'bfReserved2', 'bfOffBits', 'biSize', 'biWidth', 'biHei= ght', 'biPlanes', 'biBitCount', 'biCompression', 'biSizeImage', 'biXPelsPer= Meter', 'biYPelsPerMeter', 'biClrUsed', 'biClrImportant']) BMP_IMAGE_HEADER_STRUCT =3D struct.Struct('IHHIIIIHHIIIIII') BmpHeader =3D BMP_IMAGE_HEADER._make(BMP_IMAGE_HEADER_STRUCT.unpack_fr= om(Buffer[2:])) # @@ -2010,7 +2010,7 @@ def CreateHeaderCode(Info, AutoGenC, AutoGenH): # file header AutoGenH.Append(gAutoGenHeaderString.Replace({'FileName':'AutoGen.h'})) # header file Prologue - AutoGenH.Append(gAutoGenHPrologueString.Replace({'File':'AUTOGENH','Gu= id':Info.Guid.replace('-','_')})) + AutoGenH.Append(gAutoGenHPrologueString.Replace({'File':'AUTOGENH','Gu= id':Info.Guid.replace('-', '_')})) AutoGenH.Append(gAutoGenHCppPrologueString) if Info.AutoGenVersion >=3D 0x00010005: # header files includes @@ -2086,7 +2086,7 @@ def CreateCode(Info, AutoGenC, AutoGenH, StringH, Uni= GenCFlag, UniGenBinBuffer, if Info.UnicodeFileList: FileName =3D "%sStrDefs.h" % Info.Name StringH.Append(gAutoGenHeaderString.Replace({'FileName':FileName})) - StringH.Append(gAutoGenHPrologueString.Replace({'File':'STRDEFS', = 'Guid':Info.Guid.replace('-','_')})) + StringH.Append(gAutoGenHPrologueString.Replace({'File':'STRDEFS', = 'Guid':Info.Guid.replace('-', '_')})) CreateUnicodeStringCode(Info, AutoGenC, StringH, UniGenCFlag, UniG= enBinBuffer) =20 GuidMacros =3D [] @@ -2131,7 +2131,7 @@ def CreateCode(Info, AutoGenC, AutoGenH, StringH, Uni= GenCFlag, UniGenBinBuffer, if Info.IdfFileList: FileName =3D "%sImgDefs.h" % Info.Name StringIdf.Append(gAutoGenHeaderString.Replace({'FileName':FileName= })) - StringIdf.Append(gAutoGenHPrologueString.Replace({'File':'IMAGEDEF= S', 'Guid':Info.Guid.replace('-','_')})) + StringIdf.Append(gAutoGenHPrologueString.Replace({'File':'IMAGEDEF= S', 'Guid':Info.Guid.replace('-', '_')})) CreateIdfFileCode(Info, AutoGenC, StringIdf, IdfGenCFlag, IdfGenBi= nBuffer) =20 StringIdf.Append("\n#endif\n") diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index ea73de5fa55f..f3b23ed055fb 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -745,7 +745,7 @@ cleanlib: if CmdName =3D=3D 'Trim': SecDepsFileList.append(os.path.join('$(DEBUG_D= IR)', os.path.basename(OutputFile).replace('offset', 'efi'))) if OutputFile.endswith('.ui') or OutputFile.endswi= th('.ver'): - SecDepsFileList.append(os.path.join('$(MODULE_= DIR)','$(MODULE_FILE)')) + SecDepsFileList.append(os.path.join('$(MODULE_= DIR)', '$(MODULE_FILE)')) self.FfsOutputFileList.append((OutputFile, ' '.joi= n(SecDepsFileList), SecCmdStr)) if len(SecDepsFileList) > 0: self.ParseSecCmd(SecDepsFileList, CmdTuple) @@ -867,7 +867,7 @@ cleanlib: for Target in BuildTargets: for i, SingleCommand in enumerate(BuildTargets= [Target].Commands): if FlagDict[Flag]['Macro'] in SingleComman= d: - BuildTargets[Target].Commands[i] =3D S= ingleCommand.replace('$(INC)','').replace(FlagDict[Flag]['Macro'], RespMacr= o) + BuildTargets[Target].Commands[i] =3D S= ingleCommand.replace('$(INC)', '').replace(FlagDict[Flag]['Macro'], RespMac= ro) return RespDict =20 def ProcessBuildTargetList(self): diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source= /Python/AutoGen/GenPcdDb.py index d2958384a97f..35c709fa71f9 100644 --- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py +++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py @@ -575,22 +575,22 @@ def StringArrayToList(StringArray): # def GetTokenTypeValue(TokenType): TokenTypeDict =3D { - "PCD_TYPE_SHIFT":28, - "PCD_TYPE_DATA":(0x0 << 28), - "PCD_TYPE_HII":(0x8 << 28), - "PCD_TYPE_VPD":(0x4 << 28), + "PCD_TYPE_SHIFT": 28, + "PCD_TYPE_DATA": (0x0 << 28), + "PCD_TYPE_HII": (0x8 << 28), + "PCD_TYPE_VPD": (0x4 << 28), # "PCD_TYPE_SKU_ENABLED":(0x2 << 28), - "PCD_TYPE_STRING":(0x1 << 28), + "PCD_TYPE_STRING": (0x1 << 28), =20 - "PCD_DATUM_TYPE_SHIFT":24, - "PCD_DATUM_TYPE_POINTER":(0x0 << 24), - "PCD_DATUM_TYPE_UINT8":(0x1 << 24), - "PCD_DATUM_TYPE_UINT16":(0x2 << 24), - "PCD_DATUM_TYPE_UINT32":(0x4 << 24), - "PCD_DATUM_TYPE_UINT64":(0x8 << 24), + "PCD_DATUM_TYPE_SHIFT": 24, + "PCD_DATUM_TYPE_POINTER": (0x0 << 24), + "PCD_DATUM_TYPE_UINT8": (0x1 << 24), + "PCD_DATUM_TYPE_UINT16": (0x2 << 24), + "PCD_DATUM_TYPE_UINT32": (0x4 << 24), + "PCD_DATUM_TYPE_UINT64": (0x8 << 24), =20 - "PCD_DATUM_TYPE_SHIFT2":20, - "PCD_DATUM_TYPE_UINT8_BOOLEAN":(0x1 << 20 | 0x1 << 24), + "PCD_DATUM_TYPE_SHIFT2": 20, + "PCD_DATUM_TYPE_UINT8_BOOLEAN": (0x1 << 20 | 0x1 << 24), } return eval(TokenType, TokenTypeDict) =20 @@ -644,7 +644,7 @@ def BuildExDataBase(Dict): DbPcdCNameTable =3D DbStringItemList(0, RawDataList =3D PcdCNameTableV= alue, LenList =3D PcdCNameLen) =20 PcdNameOffsetTable =3D Dict['PCD_NAME_OFFSET'] - DbPcdNameOffsetTable =3D DbItemList(4,RawDataList =3D PcdNameOffsetTab= le) + DbPcdNameOffsetTable =3D DbItemList(4, RawDataList =3D PcdNameOffsetTa= ble) =20 SizeTableValue =3D zip(Dict['SIZE_TABLE_MAXIMUM_LENGTH'], Dict['SIZE_T= ABLE_CURRENT_LENGTH']) DbSizeTableValue =3D DbSizeTableItemList(2, RawDataList =3D SizeTableV= alue) @@ -679,16 +679,16 @@ def BuildExDataBase(Dict): PcdTokenNumberMap =3D Dict['PCD_ORDER_TOKEN_NUMBER_MAP'] =20 DbNameTotle =3D ["SkuidValue", "InitValueUint64", "VardefValueUint64"= , "InitValueUint32", "VardefValueUint32", "VpdHeadValue", "ExMapTable", - "LocalTokenNumberTable", "GuidTable", "StringHeadValue", "= PcdNameOffsetTable","VariableTable", "StringTableLen", "PcdTokenTable", "Pc= dCNameTable", + "LocalTokenNumberTable", "GuidTable", "StringHeadValue", "= PcdNameOffsetTable", "VariableTable", "StringTableLen", "PcdTokenTable", "P= cdCNameTable", "SizeTableValue", "InitValueUint16", "VardefValueUint16", "= InitValueUint8", "VardefValueUint8", "InitValueBoolean", "VardefValueBoolean", "UnInitValueUint64", "UnInitValueUint= 32", "UnInitValueUint16", "UnInitValueUint8", "UnInitValueBoolean"] =20 DbTotal =3D [SkuidValue, InitValueUint64, VardefValueUint64, InitValu= eUint32, VardefValueUint32, VpdHeadValue, ExMapTable, - LocalTokenNumberTable, GuidTable, StringHeadValue, PcdName= OffsetTable,VariableTable, StringTableLen, PcdTokenTable,PcdCNameTable, + LocalTokenNumberTable, GuidTable, StringHeadValue, PcdName= OffsetTable, VariableTable, StringTableLen, PcdTokenTable, PcdCNameTable, SizeTableValue, InitValueUint16, VardefValueUint16, InitVal= ueUint8, VardefValueUint8, InitValueBoolean, VardefValueBoolean, UnInitValueUint64, UnInitValueUint32, U= nInitValueUint16, UnInitValueUint8, UnInitValueBoolean] DbItemTotal =3D [DbSkuidValue, DbInitValueUint64, DbVardefValueUint64= , DbInitValueUint32, DbVardefValueUint32, DbVpdHeadValue, DbExMapTable, - DbLocalTokenNumberTable, DbGuidTable, DbStringHeadValue, D= bPcdNameOffsetTable,DbVariableTable, DbStringTableLen, DbPcdTokenTable, DbP= cdCNameTable, + DbLocalTokenNumberTable, DbGuidTable, DbStringHeadValue, D= bPcdNameOffsetTable, DbVariableTable, DbStringTableLen, DbPcdTokenTable, Db= PcdCNameTable, DbSizeTableValue, DbInitValueUint16, DbVardefValueUint16, D= bInitValueUint8, DbVardefValueUint8, DbInitValueBoolean, DbVardefValueBoolean, DbUnInitValueUint64, DbUnInitValueUin= t32, DbUnInitValueUint16, DbUnInitValueUint8, DbUnInitValueBoolean] =20 @@ -747,7 +747,7 @@ def BuildExDataBase(Dict): DbOffset +=3D (8 - DbOffset % 8) else: assert(False) - if isinstance(VariableRefTable[0],list): + if isinstance(VariableRefTable[0], list): DbOffset +=3D skuindex * 4 =20 skuindex +=3D 1 if DbIndex >=3D InitTableNum: @@ -894,54 +894,54 @@ def CreatePcdDatabaseCode (Info, AutoGenC, AutoGenH): Changed =3D SaveFileOnChange(DbFileName, DbFile.getvalue(), True) def CreatePcdDataBase(PcdDBData): delta =3D {} - for skuname,skuid in PcdDBData: - if len(PcdDBData[(skuname,skuid)][1]) !=3D len(PcdDBData[(TAB_DEFA= ULT,"0")][1]): + for skuname, skuid in PcdDBData: + if len(PcdDBData[(skuname, skuid)][1]) !=3D len(PcdDBData[(TAB_DEF= AULT, "0")][1]): EdkLogger.ERROR("The size of each sku in one pcd are not same") - for skuname,skuid in PcdDBData: + for skuname, skuid in PcdDBData: if skuname =3D=3D TAB_DEFAULT: continue - delta[(skuname,skuid)] =3D [(index,data,hex(data)) for index,data = in enumerate(PcdDBData[(skuname,skuid)][1]) if PcdDBData[(skuname,skuid)][1= ][index] !=3D PcdDBData[(TAB_DEFAULT,"0")][1][index]] - databasebuff =3D PcdDBData[(TAB_DEFAULT,"0")][0] + delta[(skuname, skuid)] =3D [(index, data, hex(data)) for index, d= ata in enumerate(PcdDBData[(skuname, skuid)][1]) if PcdDBData[(skuname, sku= id)][1][index] !=3D PcdDBData[(TAB_DEFAULT, "0")][1][index]] + databasebuff =3D PcdDBData[(TAB_DEFAULT, "0")][0] =20 - for skuname,skuid in delta: + for skuname, skuid in delta: # 8 byte align if len(databasebuff) % 8 > 0: for i in range(8 - (len(databasebuff) % 8)): - databasebuff +=3D pack("=3DB",0) + databasebuff +=3D pack("=3DB", 0) databasebuff +=3D pack('=3DQ', int(skuid)) databasebuff +=3D pack('=3DQ', 0) - databasebuff +=3D pack('=3DL', 8+8+4+4*len(delta[(skuname,skuid)])) - for item in delta[(skuname,skuid)]: - databasebuff +=3D pack("=3DL",item[0]) - databasebuff =3D databasebuff[:-1] + pack("=3DB",item[1]) + databasebuff +=3D pack('=3DL', 8+8+4+4*len(delta[(skuname, skuid)]= )) + for item in delta[(skuname, skuid)]: + databasebuff +=3D pack("=3DL", item[0]) + databasebuff =3D databasebuff[:-1] + pack("=3DB", item[1]) totallen =3D len(databasebuff) - totallenbuff =3D pack("=3DL",totallen) + totallenbuff =3D pack("=3DL", totallen) newbuffer =3D databasebuff[:32] for i in range(4): newbuffer +=3D totallenbuff[i] - for i in range(36,totallen): + for i in range(36, totallen): newbuffer +=3D databasebuff[i] =20 return newbuffer =20 def CreateVarCheckBin(VarCheckTab): - return VarCheckTab[(TAB_DEFAULT,"0")] + return VarCheckTab[(TAB_DEFAULT, "0")] =20 def CreateAutoGen(PcdDriverAutoGenData): autogenC =3D TemplateString() - for skuname,skuid in PcdDriverAutoGenData: + for skuname, skuid in PcdDriverAutoGenData: autogenC.Append("//SKUID: %s" % skuname) - autogenC.Append(PcdDriverAutoGenData[(skuname,skuid)][1].String) - return (PcdDriverAutoGenData[(skuname,skuid)][0],autogenC) -def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform,Phase): - def prune_sku(pcd,skuname): + autogenC.Append(PcdDriverAutoGenData[(skuname, skuid)][1].String) + return (PcdDriverAutoGenData[(skuname, skuid)][0], autogenC) +def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform, Phase): + def prune_sku(pcd, skuname): new_pcd =3D copy.deepcopy(pcd) new_pcd.SkuInfoList =3D {skuname:pcd.SkuInfoList[skuname]} new_pcd.isinit =3D 'INIT' if new_pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES: for skuobj in pcd.SkuInfoList.values(): if skuobj.DefaultValue: - defaultvalue =3D int(skuobj.DefaultValue,16) if skuobj= .DefaultValue.upper().startswith("0X") else int(skuobj.DefaultValue,10) + defaultvalue =3D int(skuobj.DefaultValue, 16) if skuob= j.DefaultValue.upper().startswith("0X") else int(skuobj.DefaultValue, 10) if defaultvalue !=3D 0: new_pcd.isinit =3D "INIT" break @@ -952,32 +952,32 @@ def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform= ,Phase): new_pcd.isinit =3D "UNINIT" return new_pcd DynamicPcds =3D Platform.DynamicPcdList - DynamicPcdSet_Sku =3D {(SkuName,skuobj.SkuId):[] for pcd in DynamicPcd= s for (SkuName,skuobj) in pcd.SkuInfoList.items() } - for skuname,skuid in DynamicPcdSet_Sku: - DynamicPcdSet_Sku[(skuname,skuid)] =3D [prune_sku(pcd,skuname) for= pcd in DynamicPcds] + DynamicPcdSet_Sku =3D {(SkuName, skuobj.SkuId):[] for pcd in DynamicPc= ds for (SkuName, skuobj) in pcd.SkuInfoList.items() } + for skuname, skuid in DynamicPcdSet_Sku: + DynamicPcdSet_Sku[(skuname, skuid)] =3D [prune_sku(pcd, skuname) f= or pcd in DynamicPcds] PcdDBData =3D {} PcdDriverAutoGenData =3D {} VarCheckTableData =3D {} if DynamicPcdSet_Sku: - for skuname,skuid in DynamicPcdSet_Sku: - AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer,VarCheckTa= b =3D CreatePcdDatabasePhaseSpecificAutoGen (Platform,DynamicPcdSet_Sku[(sk= uname,skuid)], Phase) + for skuname, skuid in DynamicPcdSet_Sku: + AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer, VarCheckT= ab =3D CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdSet_Sku[(= skuname, skuid)], Phase) final_data =3D () for item in PcdDbBuffer: - final_data +=3D unpack("B",item) - PcdDBData[(skuname,skuid)] =3D (PcdDbBuffer, final_data) - PcdDriverAutoGenData[(skuname,skuid)] =3D (AdditionalAutoGenH,= AdditionalAutoGenC) - VarCheckTableData[(skuname,skuid)] =3D VarCheckTab + final_data +=3D unpack("B", item) + PcdDBData[(skuname, skuid)] =3D (PcdDbBuffer, final_data) + PcdDriverAutoGenData[(skuname, skuid)] =3D (AdditionalAutoGenH= , AdditionalAutoGenC) + VarCheckTableData[(skuname, skuid)] =3D VarCheckTab if Platform.Platform.VarCheckFlag: dest =3D os.path.join(Platform.BuildDir, TAB_FV_DIRECTORY) VarCheckTable =3D CreateVarCheckBin(VarCheckTableData) VarCheckTable.dump(dest, Phase) AdditionalAutoGenH, AdditionalAutoGenC =3D CreateAutoGen(PcdDrive= rAutoGenData) else: - AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer,VarCheckTab = =3D CreatePcdDatabasePhaseSpecificAutoGen (Platform,{}, Phase) + AdditionalAutoGenH, AdditionalAutoGenC, PcdDbBuffer, VarCheckTab = =3D CreatePcdDatabasePhaseSpecificAutoGen (Platform, {}, Phase) final_data =3D () for item in PcdDbBuffer: - final_data +=3D unpack("B",item) - PcdDBData[(TAB_DEFAULT,"0")] =3D (PcdDbBuffer, final_data) + final_data +=3D unpack("B", item) + PcdDBData[(TAB_DEFAULT, "0")] =3D (PcdDbBuffer, final_data) =20 return AdditionalAutoGenH, AdditionalAutoGenC, CreatePcdDataBase(PcdDB= Data) ## Create PCD database in DXE or PEI phase @@ -1023,14 +1023,14 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform= , DynamicPcdList, Phase): Dict['VARDEF_SKUID_' + DatumType] =3D [] Dict['VARDEF_VALUE_' + DatumType] =3D [] Dict['VARDEF_DB_VALUE_' + DatumType] =3D [] - for Init in ['INIT','UNINIT']: + for Init in ['INIT', 'UNINIT']: Dict[Init+'_CNAME_DECL_' + DatumType] =3D [] Dict[Init+'_GUID_DECL_' + DatumType] =3D [] Dict[Init+'_NUMSKUS_DECL_' + DatumType] =3D [] Dict[Init+'_VALUE_' + DatumType] =3D [] Dict[Init+'_DB_VALUE_'+DatumType] =3D [] =20 - for Type in ['STRING_HEAD','VPD_HEAD','VARIABLE_HEAD']: + for Type in ['STRING_HEAD', 'VPD_HEAD', 'VARIABLE_HEAD']: Dict[Type + '_CNAME_DECL'] =3D [] Dict[Type + '_GUID_DECL'] =3D [] Dict[Type + '_NUMSKUS_DECL'] =3D [] @@ -1191,7 +1191,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, = DynamicPcdList, Phase): Dict['STRING_TABLE_INDEX'].append('') else: Dict['STRING_TABLE_INDEX'].append('_%d' % StringTa= bleIndex) - VarNameSize =3D len(VariableNameStructure.replace(',',= ' ').split()) + VarNameSize =3D len(VariableNameStructure.replace(',',= ' ').split()) Dict['STRING_TABLE_LENGTH'].append(VarNameSize ) Dict['STRING_TABLE_VALUE'].append(VariableNameStructur= e) StringHeadOffsetList.append(str(StringTableSize) + 'U') @@ -1199,7 +1199,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, = DynamicPcdList, Phase): VarStringDbOffsetList.append(StringTableSize) Dict['STRING_DB_VALUE'].append(VarStringDbOffsetList) StringTableIndex +=3D 1 - StringTableSize +=3D len(VariableNameStructure.replace= (',',' ').split()) + StringTableSize +=3D len(VariableNameStructure.replace= (',', ' ').split()) VariableHeadStringIndex =3D 0 for Index in range(Dict['STRING_TABLE_VALUE'].index(Variab= leNameStructure)): VariableHeadStringIndex +=3D Dict['STRING_TABLE_LENGTH= '][Index] @@ -1238,7 +1238,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, = DynamicPcdList, Phase): elif Pcd.DatumType in (TAB_UINT32, TAB_UINT16, TAB_UIN= T8): Dict['VARDEF_VALUE_'+Pcd.DatumType].append(Sku.Hii= DefaultValue + "U") elif Pcd.DatumType =3D=3D "BOOLEAN": - if eval(Sku.HiiDefaultValue) in [1,0]: + if eval(Sku.HiiDefaultValue) in [1, 0]: Dict['VARDEF_VALUE_'+Pcd.DatumType].append(str= (eval(Sku.HiiDefaultValue)) + "U") else: Dict['VARDEF_VALUE_'+Pcd.DatumType].append(Sku.Hii= DefaultValue) @@ -1288,7 +1288,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, = DynamicPcdList, Phase): Dict['STRING_TABLE_INDEX'].append('_%d' % StringTa= bleIndex) if Sku.DefaultValue[0] =3D=3D 'L': DefaultValueBinStructure =3D StringToArray(Sku.Def= aultValue) - Size =3D len(DefaultValueBinStructure.replace(',',= ' ').split()) + Size =3D len(DefaultValueBinStructure.replace(',',= ' ').split()) Dict['STRING_TABLE_VALUE'].append(DefaultValueBinS= tructure) elif Sku.DefaultValue[0] =3D=3D '"': DefaultValueBinStructure =3D StringToArray(Sku.Def= aultValue) @@ -1600,7 +1600,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, = DynamicPcdList, Phase): =20 # print Phase Buffer =3D BuildExDataBase(Dict) - return AutoGenH, AutoGenC, Buffer,VarCheckTab + return AutoGenH, AutoGenC, Buffer, VarCheckTab =20 def GetOrderedDynamicPcdList(DynamicPcdList, PcdTokenNumberList): ReorderedDyPcdList =3D [None for i in range(len(DynamicPcdList))] diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/P= ython/AutoGen/GenVar.py index faaa955431d5..51945521a82c 100644 --- a/BaseTools/Source/Python/AutoGen/GenVar.py +++ b/BaseTools/Source/Python/AutoGen/GenVar.py @@ -15,7 +15,7 @@ # Import Modules # from builtins import range -from struct import pack,unpack +from struct import pack, unpack import collections import copy from Common.VariableAttributes import VariableAttributes @@ -28,7 +28,7 @@ NvStorageHeaderSize =3D 28 VariableHeaderSize =3D 32 =20 class VariableMgr(object): - def __init__(self, DefaultStoreMap,SkuIdMap): + def __init__(self, DefaultStoreMap, SkuIdMap): self.VarInfo =3D [] self.DefaultStoreMap =3D DefaultStoreMap self.SkuIdMap =3D SkuIdMap @@ -38,19 +38,19 @@ class VariableMgr(object): self.VarDefaultBuff =3D None self.VarDeltaBuff =3D None =20 - def append_variable(self,uefi_var): + def append_variable(self, uefi_var): self.VarInfo.append(uefi_var) =20 - def SetVpdRegionMaxSize(self,maxsize): + def SetVpdRegionMaxSize(self, maxsize): self.VpdRegionSize =3D maxsize =20 - def SetVpdRegionOffset(self,vpdoffset): + def SetVpdRegionOffset(self, vpdoffset): self.VpdRegionOffset =3D vpdoffset =20 - def PatchNVStoreDefaultMaxSize(self,maxsize): + def PatchNVStoreDefaultMaxSize(self, maxsize): if not self.NVHeaderBuff: return "" - self.NVHeaderBuff =3D self.NVHeaderBuff[:8] + pack("=3DQ",maxsize) + self.NVHeaderBuff =3D self.NVHeaderBuff[:8] + pack("=3DQ", maxsize) default_var_bin =3D VariableMgr.format_data(self.NVHeaderBuff + se= lf.VarDefaultBuff + self.VarDeltaBuff) value_str =3D "{" default_var_bin_strip =3D [ data.strip("""'""") for data in defaul= t_var_bin] @@ -60,9 +60,9 @@ class VariableMgr(object): def combine_variable(self): indexedvarinfo =3D collections.OrderedDict() for item in self.VarInfo: - if (item.skuname,item.defaultstoragename, item.var_name,item.v= ar_guid) not in indexedvarinfo: - indexedvarinfo[(item.skuname,item.defaultstoragename, item= .var_name,item.var_guid) ] =3D [] - indexedvarinfo[(item.skuname,item.defaultstoragename, item.var= _name,item.var_guid)].append(item) + if (item.skuname, item.defaultstoragename, item.var_name, item= .var_guid) not in indexedvarinfo: + indexedvarinfo[(item.skuname, item.defaultstoragename, ite= m.var_name, item.var_guid) ] =3D [] + indexedvarinfo[(item.skuname, item.defaultstoragename, item.va= r_name, item.var_guid)].append(item) for key in indexedvarinfo: sku_var_info_offset_list =3D indexedvarinfo[key] if len(sku_var_info_offset_list) =3D=3D 1: @@ -75,15 +75,15 @@ class VariableMgr(object): data_flag =3D DataType.PACK_CODE_BY_SIZE[MAX_SIZE_TYPE= [data_type]] data =3D value_list[0] value_list =3D [] - for data_byte in pack(data_flag,int(data,16) if data.u= pper().startswith('0X') else int(data)): - value_list.append(hex(unpack("B",data_byte)[0])) - newvalue[int(item.var_offset,16) if item.var_offset.upper(= ).startswith("0X") else int(item.var_offset)] =3D value_list + for data_byte in pack(data_flag, int(data, 16) if data= .upper().startswith('0X') else int(data)): + value_list.append(hex(unpack("B", data_byte)[0])) + newvalue[int(item.var_offset, 16) if item.var_offset.upper= ().startswith("0X") else int(item.var_offset)] =3D value_list try: newvaluestr =3D "{" + ",".join(VariableMgr.assemble_variab= le(newvalue)) +"}" except: EdkLogger.error("build", AUTOGEN_ERROR, "Variable offset c= onflict in PCDs: %s \n" % (" and ".join(item.pcdname for item in sku_var_in= fo_offset_list))) n =3D sku_var_info_offset_list[0] - indexedvarinfo[key] =3D [var_info(n.pcdindex,n.pcdname,n.defa= ultstoragename,n.skuname,n.var_name, n.var_guid, "0x00",n.var_attribute,new= valuestr , newvaluestr , DataType.TAB_VOID)] + indexedvarinfo[key] =3D [var_info(n.pcdindex, n.pcdname, n.de= faultstoragename, n.skuname, n.var_name, n.var_guid, "0x00", n.var_attribut= e, newvaluestr, newvaluestr, DataType.TAB_VOID)] self.VarInfo =3D [item[0] for item in indexedvarinfo.values()] =20 @staticmethod @@ -106,7 +106,7 @@ class VariableMgr(object): for item in self.VarInfo: if item.pcdindex not in indexedvarinfo: indexedvarinfo[item.pcdindex] =3D dict() - indexedvarinfo[item.pcdindex][(item.skuname,item.defaultstorag= ename)] =3D item + indexedvarinfo[item.pcdindex][(item.skuname, item.defaultstora= gename)] =3D item =20 for index in indexedvarinfo: sku_var_info =3D indexedvarinfo[index] @@ -114,40 +114,40 @@ class VariableMgr(object): default_data_buffer =3D "" others_data_buffer =3D "" tail =3D None - default_sku_default =3D indexedvarinfo[index].get((DataType.TA= B_DEFAULT,DataType.TAB_DEFAULT_STORES_DEFAULT)) + default_sku_default =3D indexedvarinfo[index].get((DataType.TA= B_DEFAULT, DataType.TAB_DEFAULT_STORES_DEFAULT)) =20 if default_sku_default.data_type not in DataType.TAB_PCD_NUMER= IC_TYPES: var_max_len =3D max(len(var_item.default_value.split(","))= for var_item in sku_var_info.values()) if len(default_sku_default.default_value.split(",")) < var= _max_len: tail =3D ",".join("0x00" for i in range(var_max_len-le= n(default_sku_default.default_value.split(",")))) =20 - default_data_buffer =3D VariableMgr.PACK_VARIABLES_DATA(defaul= t_sku_default.default_value,default_sku_default.data_type,tail) + default_data_buffer =3D VariableMgr.PACK_VARIABLES_DATA(defaul= t_sku_default.default_value, default_sku_default.data_type, tail) =20 default_data_array =3D () for item in default_data_buffer: - default_data_array +=3D unpack("B",item) + default_data_array +=3D unpack("B", item) =20 - var_data[(DataType.TAB_DEFAULT,DataType.TAB_DEFAULT_STORES_DEF= AULT)][index] =3D (default_data_buffer,sku_var_info[(DataType.TAB_DEFAULT,D= ataType.TAB_DEFAULT_STORES_DEFAULT)]) + var_data[(DataType.TAB_DEFAULT, DataType.TAB_DEFAULT_STORES_DE= FAULT)][index] =3D (default_data_buffer, sku_var_info[(DataType.TAB_DEFAULT= , DataType.TAB_DEFAULT_STORES_DEFAULT)]) =20 - for (skuid,defaultstoragename) in indexedvarinfo[index]: + for (skuid, defaultstoragename) in indexedvarinfo[index]: tail =3D None - if (skuid,defaultstoragename) =3D=3D (DataType.TAB_DEFAULT= ,DataType.TAB_DEFAULT_STORES_DEFAULT): + if (skuid, defaultstoragename) =3D=3D (DataType.TAB_DEFAUL= T, DataType.TAB_DEFAULT_STORES_DEFAULT): continue - other_sku_other =3D indexedvarinfo[index][(skuid,defaultst= oragename)] + other_sku_other =3D indexedvarinfo[index][(skuid, defaults= toragename)] =20 if default_sku_default.data_type not in DataType.TAB_PCD_N= UMERIC_TYPES: if len(other_sku_other.default_value.split(",")) < var= _max_len: tail =3D ",".join("0x00" for i in range(var_max_le= n-len(other_sku_other.default_value.split(",")))) =20 - others_data_buffer =3D VariableMgr.PACK_VARIABLES_DATA(oth= er_sku_other.default_value,other_sku_other.data_type,tail) + others_data_buffer =3D VariableMgr.PACK_VARIABLES_DATA(oth= er_sku_other.default_value, other_sku_other.data_type, tail) =20 others_data_array =3D () for item in others_data_buffer: - others_data_array +=3D unpack("B",item) + others_data_array +=3D unpack("B", item) =20 data_delta =3D VariableMgr.calculate_delta(default_data_ar= ray, others_data_array) =20 - var_data[(skuid,defaultstoragename)][index] =3D (data_delt= a,sku_var_info[(skuid,defaultstoragename)]) + var_data[(skuid, defaultstoragename)][index] =3D (data_del= ta, sku_var_info[(skuid, defaultstoragename)]) return var_data =20 def new_process_varinfo(self): @@ -158,17 +158,17 @@ class VariableMgr(object): if not var_data: return [] =20 - pcds_default_data =3D var_data.get((DataType.TAB_DEFAULT,DataType.= TAB_DEFAULT_STORES_DEFAULT),{}) + pcds_default_data =3D var_data.get((DataType.TAB_DEFAULT, DataType= .TAB_DEFAULT_STORES_DEFAULT), {}) NvStoreDataBuffer =3D "" var_data_offset =3D collections.OrderedDict() offset =3D NvStorageHeaderSize - for default_data,default_info in pcds_default_data.values(): + for default_data, default_info in pcds_default_data.values(): var_name_buffer =3D VariableMgr.PACK_VARIABLE_NAME(default_inf= o.var_name) =20 vendorguid =3D default_info.var_guid.split('-') =20 if default_info.var_attribute: - var_attr_value,_ =3D VariableAttributes.GetVarAttributes(d= efault_info.var_attribute) + var_attr_value, _ =3D VariableAttributes.GetVarAttributes(= default_info.var_attribute) else: var_attr_value =3D 0x07 =20 @@ -187,22 +187,22 @@ class VariableMgr(object): nv_default_part =3D VariableMgr.AlignData(VariableMgr.PACK_DEFAULT= _DATA(0, 0, VariableMgr.unpack_data(variable_storage_header_buffer+NvStoreD= ataBuffer)), 8) =20 data_delta_structure_buffer =3D "" - for skuname,defaultstore in var_data: - if (skuname,defaultstore) =3D=3D (DataType.TAB_DEFAULT,DataTyp= e.TAB_DEFAULT_STORES_DEFAULT): + for skuname, defaultstore in var_data: + if (skuname, defaultstore) =3D=3D (DataType.TAB_DEFAULT, DataT= ype.TAB_DEFAULT_STORES_DEFAULT): continue - pcds_sku_data =3D var_data[(skuname,defaultstore)] + pcds_sku_data =3D var_data[(skuname, defaultstore)] delta_data_set =3D [] for pcdindex in pcds_sku_data: offset =3D var_data_offset[pcdindex] - delta_data,_ =3D pcds_sku_data[pcdindex] + delta_data, _ =3D pcds_sku_data[pcdindex] delta_data =3D [(item[0] + offset, item[1]) for item in de= lta_data] delta_data_set.extend(delta_data) =20 - data_delta_structure_buffer +=3D VariableMgr.AlignData(self.PA= CK_DELTA_DATA(skuname,defaultstore,delta_data_set), 8) + data_delta_structure_buffer +=3D VariableMgr.AlignData(self.PA= CK_DELTA_DATA(skuname, defaultstore, delta_data_set), 8) =20 size =3D len(nv_default_part + data_delta_structure_buffer) + 16 maxsize =3D self.VpdRegionSize if self.VpdRegionSize else size - NV_Store_Default_Header =3D VariableMgr.PACK_NV_STORE_DEFAULT_HEAD= ER(size,maxsize) + NV_Store_Default_Header =3D VariableMgr.PACK_NV_STORE_DEFAULT_HEAD= ER(size, maxsize) =20 self.NVHeaderBuff =3D NV_Store_Default_Header self.VarDefaultBuff =3Dnv_default_part @@ -218,7 +218,7 @@ class VariableMgr(object): def unpack_data(data): final_data =3D () for item in data: - final_data +=3D unpack("B",item) + final_data +=3D unpack("B", item) return final_data =20 @staticmethod @@ -228,7 +228,7 @@ class VariableMgr(object): data_delta =3D [] for i in range(len(default)): if default[i] !=3D theother[i]: - data_delta.append((i,theother[i])) + data_delta.append((i, theother[i])) return data_delta =20 def dump(self): @@ -249,36 +249,36 @@ class VariableMgr(object): Guid =3D GuidStructureStringToGuidString(Guid) GuidBuffer =3D PackGUID(Guid.split('-')) =20 - SizeBuffer =3D pack('=3DL',size) - FormatBuffer =3D pack('=3DB',0x5A) - StateBuffer =3D pack('=3DB',0xFE) - reservedBuffer =3D pack('=3DH',0) - reservedBuffer +=3D pack('=3DL',0) + SizeBuffer =3D pack('=3DL', size) + FormatBuffer =3D pack('=3DB', 0x5A) + StateBuffer =3D pack('=3DB', 0xFE) + reservedBuffer =3D pack('=3DH', 0) + reservedBuffer +=3D pack('=3DL', 0) =20 return GuidBuffer + SizeBuffer + FormatBuffer + StateBuffer + rese= rvedBuffer =20 @staticmethod - def PACK_NV_STORE_DEFAULT_HEADER(size,maxsize): - Signature =3D pack('=3DB',ord('N')) - Signature +=3D pack("=3DB",ord('S')) - Signature +=3D pack("=3DB",ord('D')) - Signature +=3D pack("=3DB",ord('B')) + def PACK_NV_STORE_DEFAULT_HEADER(size, maxsize): + Signature =3D pack('=3DB', ord('N')) + Signature +=3D pack("=3DB", ord('S')) + Signature +=3D pack("=3DB", ord('D')) + Signature +=3D pack("=3DB", ord('B')) =20 - SizeBuffer =3D pack("=3DL",size) - MaxSizeBuffer =3D pack("=3DQ",maxsize) + SizeBuffer =3D pack("=3DL", size) + MaxSizeBuffer =3D pack("=3DQ", maxsize) =20 return Signature + SizeBuffer + MaxSizeBuffer =20 @staticmethod - def PACK_VARIABLE_HEADER(attribute,namesize,datasize,vendorguid): + def PACK_VARIABLE_HEADER(attribute, namesize, datasize, vendorguid): =20 - Buffer =3D pack('=3DH',0x55AA) # pack StartID - Buffer +=3D pack('=3DB',0x3F) # pack State - Buffer +=3D pack('=3DB',0) # pack reserved + Buffer =3D pack('=3DH', 0x55AA) # pack StartID + Buffer +=3D pack('=3DB', 0x3F) # pack State + Buffer +=3D pack('=3DB', 0) # pack reserved =20 - Buffer +=3D pack('=3DL',attribute) - Buffer +=3D pack('=3DL',namesize) - Buffer +=3D pack('=3DL',datasize) + Buffer +=3D pack('=3DL', attribute) + Buffer +=3D pack('=3DL', namesize) + Buffer +=3D pack('=3DL', datasize) =20 Buffer +=3D PackGUID(vendorguid) =20 @@ -290,66 +290,66 @@ class VariableMgr(object): data_len =3D 0 if data_type =3D=3D DataType.TAB_VOID: for value_char in var_value.strip("{").strip("}").split(","): - Buffer +=3D pack("=3DB",int(value_char,16)) + Buffer +=3D pack("=3DB", int(value_char, 16)) data_len +=3D len(var_value.split(",")) if tail: for value_char in tail.split(","): - Buffer +=3D pack("=3DB",int(value_char,16)) + Buffer +=3D pack("=3DB", int(value_char, 16)) data_len +=3D len(tail.split(",")) elif data_type =3D=3D "BOOLEAN": - Buffer +=3D pack("=3DB",True) if var_value.upper() =3D=3D "TRU= E" else pack("=3DB",False) + Buffer +=3D pack("=3DB", True) if var_value.upper() =3D=3D "TR= UE" else pack("=3DB", False) data_len +=3D 1 elif data_type =3D=3D DataType.TAB_UINT8: - Buffer +=3D pack("=3DB",GetIntegerValue(var_value)) + Buffer +=3D pack("=3DB", GetIntegerValue(var_value)) data_len +=3D 1 elif data_type =3D=3D DataType.TAB_UINT16: - Buffer +=3D pack("=3DH",GetIntegerValue(var_value)) + Buffer +=3D pack("=3DH", GetIntegerValue(var_value)) data_len +=3D 2 elif data_type =3D=3D DataType.TAB_UINT32: - Buffer +=3D pack("=3DL",GetIntegerValue(var_value)) + Buffer +=3D pack("=3DL", GetIntegerValue(var_value)) data_len +=3D 4 elif data_type =3D=3D DataType.TAB_UINT64: - Buffer +=3D pack("=3DQ",GetIntegerValue(var_value)) + Buffer +=3D pack("=3DQ", GetIntegerValue(var_value)) data_len +=3D 8 =20 return Buffer =20 @staticmethod - def PACK_DEFAULT_DATA(defaultstoragename,skuid,var_value): + def PACK_DEFAULT_DATA(defaultstoragename, skuid, var_value): Buffer =3D "" - Buffer +=3D pack("=3DL",4+8+8) - Buffer +=3D pack("=3DQ",int(skuid)) - Buffer +=3D pack("=3DQ",int(defaultstoragename)) + Buffer +=3D pack("=3DL", 4+8+8) + Buffer +=3D pack("=3DQ", int(skuid)) + Buffer +=3D pack("=3DQ", int(defaultstoragename)) =20 for item in var_value: - Buffer +=3D pack("=3DB",item) + Buffer +=3D pack("=3DB", item) =20 - Buffer =3D pack("=3DL",len(Buffer)+4) + Buffer + Buffer =3D pack("=3DL", len(Buffer)+4) + Buffer =20 return Buffer =20 - def GetSkuId(self,skuname): + def GetSkuId(self, skuname): if skuname not in self.SkuIdMap: return None return self.SkuIdMap.get(skuname)[0] =20 - def GetDefaultStoreId(self,dname): + def GetDefaultStoreId(self, dname): if dname not in self.DefaultStoreMap: return None return self.DefaultStoreMap.get(dname)[0] =20 - def PACK_DELTA_DATA(self,skuname,defaultstoragename,delta_list): + def PACK_DELTA_DATA(self, skuname, defaultstoragename, delta_list): skuid =3D self.GetSkuId(skuname) defaultstorageid =3D self.GetDefaultStoreId(defaultstoragename) Buffer =3D "" - Buffer +=3D pack("=3DL",4+8+8) - Buffer +=3D pack("=3DQ",int(skuid)) - Buffer +=3D pack("=3DQ",int(defaultstorageid)) - for (delta_offset,value) in delta_list: - Buffer +=3D pack("=3DL",delta_offset) - Buffer =3D Buffer[:-1] + pack("=3DB",value) + Buffer +=3D pack("=3DL", 4+8+8) + Buffer +=3D pack("=3DQ", int(skuid)) + Buffer +=3D pack("=3DQ", int(defaultstorageid)) + for (delta_offset, value) in delta_list: + Buffer +=3D pack("=3DL", delta_offset) + Buffer =3D Buffer[:-1] + pack("=3DB", value) =20 - Buffer =3D pack("=3DL",len(Buffer) + 4) + Buffer + Buffer =3D pack("=3DL", len(Buffer) + 4) + Buffer =20 return Buffer =20 @@ -358,7 +358,7 @@ class VariableMgr(object): mybuffer =3D data if (len(data) % align) > 0: for i in range(align - (len(data) % align)): - mybuffer +=3D pack("=3DB",0) + mybuffer +=3D pack("=3DB", 0) =20 return mybuffer =20 @@ -366,6 +366,6 @@ class VariableMgr(object): def PACK_VARIABLE_NAME(var_name): Buffer =3D "" for name_char in var_name.strip("{").strip("}").split(","): - Buffer +=3D pack("=3DB",int(name_char,16)) + Buffer +=3D pack("=3DB", int(name_char, 16)) =20 return Buffer diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Sourc= e/Python/AutoGen/StrGather.py index 844d2d8d8856..9620a5f2ea71 100644 --- a/BaseTools/Source/Python/AutoGen/StrGather.py +++ b/BaseTools/Source/Python/AutoGen/StrGather.py @@ -95,7 +95,7 @@ PRINTABLE_LANGUAGE_NAME_STRING_NAME =3D '$PRINTABLE_LANGU= AGE_NAME' # @retval: The formatted hex string # def DecToHexStr(Dec, Digit =3D 8): - return '0x{0:0{1}X}'.format(Dec,Digit) + return '0x{0:0{1}X}'.format(Dec, Digit) =20 ## Convert a dec number to a hex list # @@ -110,7 +110,7 @@ def DecToHexStr(Dec, Digit =3D 8): # @retval: A list for formatted hex string # def DecToHexList(Dec, Digit =3D 8): - Hex =3D '{0:0{1}X}'.format(Dec,Digit) + Hex =3D '{0:0{1}X}'.format(Dec, Digit) return ["0x" + Hex[Bit:Bit + 2] for Bit in range(Digit - 2, -1, -2)] =20 ## Convert a acsii string to a hex list diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/Source/Pyth= on/BPDG/GenVpd.py index 999cadf3437d..6dbc2c421730 100644 --- a/BaseTools/Source/Python/BPDG/GenVpd.py +++ b/BaseTools/Source/Python/BPDG/GenVpd.py @@ -350,7 +350,7 @@ class GenVPD : # # Enhanced for support "|" character in the string. # - ValueList =3D ['', '', '', '',''] + ValueList =3D ['', '', '', '', ''] =20 ValueRe =3D re.compile(r'\s*L?\".*\|.*\"\s*$') PtrValue =3D ValueRe.findall(line) @@ -400,7 +400,7 @@ class GenVPD : count =3D 0 for line in self.FileLinesList: if line is not None : - PCD =3D PcdEntry(line[0], line[1], line[2], line[3], line[= 4],line[5], self.InputFileName) =20 + PCD =3D PcdEntry(line[0], line[1], line[2], line[3], line[= 4], line[5], self.InputFileName) # Strip the space char PCD.PcdCName =3D PCD.PcdCName.strip(' ') PCD.SkuId =3D PCD.SkuId.strip(' ') @@ -514,10 +514,10 @@ class GenVPD : index =3D0 for pcd in self.PcdUnknownOffsetList: index +=3D 1 - if pcd.PcdCName =3D=3D ".".join(("gEfiMdeModulePkgTokenSpaceGu= id","PcdNvStoreDefaultValueBuffer")): + if pcd.PcdCName =3D=3D ".".join(("gEfiMdeModulePkgTokenSpaceGu= id", "PcdNvStoreDefaultValueBuffer")): if index !=3D len(self.PcdUnknownOffsetList): for i in range(len(self.PcdUnknownOffsetList) - index): - self.PcdUnknownOffsetList[index+i -1 ] , self.PcdU= nknownOffsetList[index+i] =3D self.PcdUnknownOffsetList[index+i] , self.Pcd= UnknownOffsetList[index+i -1] + self.PcdUnknownOffsetList[index+i -1 ], self.PcdUn= knownOffsetList[index+i] =3D self.PcdUnknownOffsetList[index+i], self.PcdUn= knownOffsetList[index+i -1] =20 # # Process all Offset value are "*" @@ -598,7 +598,7 @@ class GenVPD : eachUnfixedPcd.PcdOffset =3D str(hex(La= stOffset)) eachUnfixedPcd.PcdBinOffset =3D LastOffset # Insert this pcd into fixed offset pcd li= st. - self.PcdFixedOffsetSizeList.insert(FixOffs= etSizeListCount,eachUnfixedPcd) + self.PcdFixedOffsetSizeList.insert(FixOffs= etSizeListCount, eachUnfixedPcd) =20 # Delete the item's offset that has been f= ixed and added into fixed offset list self.PcdUnknownOffsetList.pop(countOfUnfix= edList) @@ -686,7 +686,7 @@ class GenVPD : for eachPcd in self.PcdFixedOffsetSizeList : # write map file try : - fMapFile.write("%s | %s | %s | %s | %s \n" % (eachPcd.Pcd= CName, eachPcd.SkuId,eachPcd.PcdOffset, eachPcd.PcdSize,eachPcd.PcdUnpackVa= lue)) + fMapFile.write("%s | %s | %s | %s | %s \n" % (eachPcd.Pcd= CName, eachPcd.SkuId, eachPcd.PcdOffset, eachPcd.PcdSize, eachPcd.PcdUnpack= Value)) except: EdkLogger.error("BPDG", BuildToolError.FILE_WRITE_FAILURE,= "Write data to file %s failed, please check whether the file been locked o= r using by other applications." % self.MapFileName, None) =20 diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/= Python/Common/DataType.py index a72c7e6f067f..5d8c4cf01c57 100644 --- a/BaseTools/Source/Python/Common/DataType.py +++ b/BaseTools/Source/Python/Common/DataType.py @@ -531,8 +531,8 @@ PCDS_DYNAMICEX_DEFAULT =3D "PcdsDynamicExDefault" PCDS_DYNAMICEX_VPD =3D "PcdsDynamicExVpd" PCDS_DYNAMICEX_HII =3D "PcdsDynamicExHii" =20 -SECTIONS_HAVE_ITEM_PCD_SET =3D {PCDS_DYNAMIC_DEFAULT.upper(),PCDS_DYNAMIC_= VPD.upper(),PCDS_DYNAMIC_HII.upper(), \ - PCDS_DYNAMICEX_DEFAULT.upper(),PCDS_DYNAMICE= X_VPD.upper(),PCDS_DYNAMICEX_HII.upper()} +SECTIONS_HAVE_ITEM_PCD_SET =3D {PCDS_DYNAMIC_DEFAULT.upper(), PCDS_DYNAMIC= _VPD.upper(), PCDS_DYNAMIC_HII.upper(), \ + PCDS_DYNAMICEX_DEFAULT.upper(), PCDS_DYNAMIC= EX_VPD.upper(), PCDS_DYNAMICEX_HII.upper()} # Section allowed to have items after arch SECTIONS_HAVE_ITEM_AFTER_ARCH_SET =3D {TAB_LIBRARY_CLASSES.upper(), TAB_DE= PEX.upper(), TAB_USER_EXTENSIONS.upper(), PCDS_DYNAMIC_DEFAULT.upper(), diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Sourc= e/Python/Common/Expression.py index a4afe1783e33..5f24789f6c05 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -570,7 +570,7 @@ class ValueExpression(BaseExpression): IsArray =3D IsGuid =3D False if len(Token.split(',')) =3D=3D 11 and len(Token.split(',{')) =3D= =3D 2 \ and len(Token.split('},')) =3D=3D 1: - HexLen =3D [11,6,6,5,4,4,4,4,4,4,6] + HexLen =3D [11, 6, 6, 5, 4, 4, 4, 4, 4, 4, 6] HexList=3D Token.split(',') if HexList[3].startswith('{') and \ not [Index for Index, Hex in enumerate(HexList) if len(Hex= ) > HexLen[Index]]: @@ -766,7 +766,7 @@ class ValueExpression(BaseExpression): # Parse operator def _GetOperator(self): self.__SkipWS() - LegalOpLst =3D ['&&', '||', '!=3D', '=3D=3D', '>=3D', '<=3D'] + se= lf.NonLetterOpLst + ['?',':'] + LegalOpLst =3D ['&&', '||', '!=3D', '=3D=3D', '>=3D', '<=3D'] + se= lf.NonLetterOpLst + ['?', ':'] =20 self._Token =3D '' Expr =3D self._Expr[self._Idx:] @@ -843,7 +843,7 @@ class ValueExpressionEx(ValueExpression): elif Item.startswith(TAB_UINT64): ItemSize =3D 8 ValueType =3D TAB_UINT64 - elif Item[0] in {'"',"'",'L'}: + elif Item[0] in {'"', "'", 'L'}: ItemSize =3D 0 ValueType =3D TAB_VOID else: @@ -947,7 +947,7 @@ class ValueExpressionEx(ValueExpression): # replace each offset, except errors for Offset in OffsetList: try: - Item =3D Item.replace('OFFSET_OF({})'.= format(Offset),LabelDict[Offset]) + Item =3D Item.replace('OFFSET_OF({})'.= format(Offset), LabelDict[Offset]) except: raise BadExpression('%s not defined' %= Offset) =20 @@ -1000,7 +1000,7 @@ class ValueExpressionEx(ValueExpression): Item =3D '0x%x' % TmpValue if type(TmpValu= e) !=3D type('') else TmpValue if ItemSize =3D=3D 0: ItemValue, ItemSize =3D ParseFieldValu= e(Item) - if Item[0] not in {'"','L','{'} and It= emSize > 1: + if Item[0] not in {'"', 'L', '{'} and = ItemSize > 1: raise BadExpression("Byte array n= umber %s should less than 0xFF." % Item) else: ItemValue =3D ParseFieldValue(Item)[0] diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Pyth= on/Common/Misc.py index ebf706a55d7e..739a2b0cb45b 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -133,7 +133,7 @@ def _parseForGCC(lines, efifilepath, varnames): if Str: m =3D pcdPatternGcc.match(Str.strip()) if m is not None: - varoffset.append((varname, int(m.groups(0)[0],= 16) , int(sections[-1][1], 16), sections[-1][0])) + varoffset.append((varname, int(m.groups(0)[0],= 16), int(sections[-1][1], 16), sections[-1][0])) =20 if not varoffset: return [] @@ -1470,7 +1470,7 @@ def AnalyzeDscPcd(Setting, PcdType, DataType=3D''): # Value, Size =3D ParseFieldValue(Value) if Size: try: - int(Size,16) if Size.upper().startswith("0X") else int(Siz= e) + int(Size, 16) if Size.upper().startswith("0X") else int(Si= ze) except: IsValid =3D False Size =3D -1 @@ -1491,7 +1491,7 @@ def AnalyzeDscPcd(Setting, PcdType, DataType=3D''): =20 if Size: try: - int(Size,16) if Size.upper().startswith("0X") else int(Siz= e) + int(Size, 16) if Size.upper().startswith("0X") else int(Si= ze) except: IsValid =3D False Size =3D -1 @@ -1513,7 +1513,7 @@ def AnalyzeDscPcd(Setting, PcdType, DataType=3D''): IsValid =3D (len(FieldList) <=3D 3) if Size: try: - int(Size,16) if Size.upper().startswith("0X") else int(Siz= e) + int(Size, 16) if Size.upper().startswith("0X") else int(Si= ze) except: IsValid =3D False Size =3D -1 @@ -1671,7 +1671,7 @@ def ConvertStringToByteArray(Value): =20 Value =3D eval(Value) # translate escape character NewValue =3D '{' - for Index in range(0,len(Value)): + for Index in range(0, len(Value)): if Unicode: NewValue =3D NewValue + str(ord(Value[Index]) % 0x10000) + ',' else: @@ -1915,28 +1915,28 @@ class PeImageClass(): return Value =20 class DefaultStore(): - def __init__(self,DefaultStores ): + def __init__(self, DefaultStores ): =20 self.DefaultStores =3D DefaultStores - def DefaultStoreID(self,DefaultStoreName): - for key,value in self.DefaultStores.items(): + def DefaultStoreID(self, DefaultStoreName): + for key, value in self.DefaultStores.items(): if value =3D=3D DefaultStoreName: return key return None def GetDefaultDefault(self): if not self.DefaultStores or "0" in self.DefaultStores: - return "0",TAB_DEFAULT_STORES_DEFAULT + return "0", TAB_DEFAULT_STORES_DEFAULT else: minvalue =3D min(int(value_str) for value_str in self.DefaultS= tores) return (str(minvalue), self.DefaultStores[str(minvalue)]) - def GetMin(self,DefaultSIdList): + def GetMin(self, DefaultSIdList): if not DefaultSIdList: return TAB_DEFAULT_STORES_DEFAULT storeidset =3D {storeid for storeid, storename in self.DefaultStor= es.values() if storename in DefaultSIdList} if not storeidset: return "" minid =3D min(storeidset ) - for sid,name in self.DefaultStores.values(): + for sid, name in self.DefaultStores.values(): if sid =3D=3D minid: return name class SkuClass(): @@ -1951,7 +1951,7 @@ class SkuClass(): =20 for SkuName in SkuIds: SkuId =3D SkuIds[SkuName][0] - skuid_num =3D int(SkuId,16) if SkuId.upper().startswith("0X") = else int(SkuId) + skuid_num =3D int(SkuId, 16) if SkuId.upper().startswith("0X")= else int(SkuId) if skuid_num > 0xFFFFFFFFFFFFFFFF: EdkLogger.error("build", PARAMETER_INVALID, ExtraData =3D "SKU-ID [%s] value %s exceeds th= e max value of UINT64" @@ -2004,9 +2004,9 @@ class SkuClass(): self.__SkuInherit =3D {} for item in self.SkuData.values(): self.__SkuInherit[item[1]]=3Ditem[2] if item[2] else "DEFA= ULT" - return self.__SkuInherit.get(skuname,"DEFAULT") + return self.__SkuInherit.get(skuname, "DEFAULT") =20 - def GetSkuChain(self,sku): + def GetSkuChain(self, sku): if sku =3D=3D "DEFAULT": return ["DEFAULT"] skulist =3D [sku] diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/= Source/Python/Common/RangeExpression.py index 284ee9c16334..d02e52f349b0 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -18,7 +18,7 @@ from Common.GlobalData import * from CommonDataClass.Exceptions import BadExpression from CommonDataClass.Exceptions import WrnExpression import uuid -from Common.Expression import PcdPattern,BaseExpression +from Common.Expression import PcdPattern, BaseExpression from Common.DataType import * =20 ERR_STRING_EXPR =3D 'This operator cannot be used in string expression: [%= s].' @@ -168,7 +168,7 @@ class EQOperatorObject(object): raise BadExpression(ERR_SNYTAX % Expr) rangeId1 =3D str(uuid.uuid1()) rangeContainer =3D RangeContainer() - rangeContainer.push(RangeObject(int(Operand) , int(Operand))) + rangeContainer.push(RangeObject(int(Operand), int(Operand))) SymbolTable[rangeId1] =3D rangeContainer return rangeId1 =20 =20 @@ -454,7 +454,7 @@ class RangeExpression(BaseExpression): =20 # [!]*A def _RelExpr(self): - if self._IsOperator({"NOT" , "LE", "GE", "LT", "GT", "EQ", "XOR"}): + if self._IsOperator({"NOT", "LE", "GE", "LT", "GT", "EQ", "XOR"}): Token =3D self._Token Val =3D self._NeExpr() try: diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Sour= ce/Python/Common/StringUtils.py index 833bdcf5614b..e9ac77dc71a1 100644 --- a/BaseTools/Source/Python/Common/StringUtils.py +++ b/BaseTools/Source/Python/Common/StringUtils.py @@ -751,7 +751,7 @@ def SplitString(String): # @param StringList: A list for strings to be converted # def ConvertToSqlString(StringList): - return map(lambda s: s.replace("'", "''") , StringList) + return map(lambda s: s.replace("'", "''"), StringList) =20 ## Convert To Sql String # diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseToo= ls/Source/Python/Common/ToolDefClassObject.py index 3a1cb13ff690..d79b970f5416 100644 --- a/BaseTools/Source/Python/Common/ToolDefClassObject.py +++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py @@ -27,9 +27,9 @@ from Common.StringUtils import NormPath import Common.GlobalData as GlobalData from Common import GlobalData from Common.MultipleWorkspace import MultipleWorkspace as mws -from DataType import TAB_TOD_DEFINES_TARGET,TAB_TOD_DEFINES_TOOL_CHAIN_TAG= ,\ - TAB_TOD_DEFINES_TARGET_ARCH,TAB_TOD_DEFINES_COMMAND_T= YPE\ - ,TAB_TOD_DEFINES_FAMILY,TAB_TOD_DEFINES_BUILDRULEFAMI= LY +from DataType import TAB_TOD_DEFINES_TARGET, TAB_TOD_DEFINES_TOOL_CHAIN_TA= G,\ + TAB_TOD_DEFINES_TARGET_ARCH, TAB_TOD_DEFINES_COMMAND_= TYPE\ + , TAB_TOD_DEFINES_FAMILY, TAB_TOD_DEFINES_BUILDRULEFA= MILY =20 =20 ## diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Sour= ce/Python/Common/VpdInfoFile.py index ddabe9fb2546..93175d41e9f7 100644 --- a/BaseTools/Source/Python/Common/VpdInfoFile.py +++ b/BaseTools/Source/Python/Common/VpdInfoFile.py @@ -88,7 +88,7 @@ class VpdInfoFile: # # @param offset integer value for VPD's offset in specific SKU. # - def Add(self, Vpd, skuname,Offset): + def Add(self, Vpd, skuname, Offset): if (Vpd is None): EdkLogger.error("VpdInfoFile", BuildToolError.ATTRIBUTE_UNKNOW= N_ERROR, "Invalid VPD PCD entry.") =20 @@ -140,7 +140,7 @@ class VpdInfoFile: if PcdValue =3D=3D "" : PcdValue =3D Pcd.DefaultValue =20 - Content +=3D "%s.%s|%s|%s|%s|%s \n" % (Pcd.TokenSpaceGuid= CName, PcdTokenCName, skuname,str(self._VpdArray[Pcd][skuname]).strip(), st= r(Pcd.MaxDatumSize).strip(),PcdValue) + Content +=3D "%s.%s|%s|%s|%s|%s \n" % (Pcd.TokenSpaceGuid= CName, PcdTokenCName, skuname, str(self._VpdArray[Pcd][skuname]).strip(), s= tr(Pcd.MaxDatumSize).strip(), PcdValue) i +=3D 1 =20 return SaveFileOnChange(FilePath, Content, False) @@ -169,8 +169,8 @@ class VpdInfoFile: # the line must follow output format defined in BPDG spec. # try: - PcdName, SkuId,Offset, Size, Value =3D Line.split("#")[0].= split("|") - PcdName, SkuId,Offset, Size, Value =3D PcdName.strip(), Sk= uId.strip(),Offset.strip(), Size.strip(), Value.strip() + PcdName, SkuId, Offset, Size, Value =3D Line.split("#")[0]= .split("|") + PcdName, SkuId, Offset, Size, Value =3D PcdName.strip(), S= kuId.strip(), Offset.strip(), Size.strip(), Value.strip() TokenSpaceName, PcdTokenName =3D PcdName.split(".") except: EdkLogger.error("BPDG", BuildToolError.PARSER_ERROR, "Fail= to parse VPD information file %s" % FilePath) @@ -179,7 +179,7 @@ class VpdInfoFile: =20 if (TokenSpaceName, PcdTokenName) not in self._VpdInfo: self._VpdInfo[(TokenSpaceName, PcdTokenName)] =3D [] - self._VpdInfo[(TokenSpaceName, PcdTokenName)].append((SkuId,Of= fset, Value)) + self._VpdInfo[(TokenSpaceName, PcdTokenName)].append((SkuId, O= ffset, Value)) for VpdObject in self._VpdArray: VpdObjectTokenCName =3D VpdObject.TokenCName for PcdItem in GlobalData.MixedPcd: diff --git a/BaseTools/Source/Python/Ecc/CParser.py b/BaseTools/Source/Pyth= on/Ecc/CParser.py index 80cf278cf87c..51a05902e225 100644 --- a/BaseTools/Source/Python/Ecc/CParser.py +++ b/BaseTools/Source/Python/Ecc/CParser.py @@ -785,10 +785,10 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if d is not None: - self.function_definition_stack[-1].ModifierText =3D = self.input.toString(d.start,d.stop) + self.function_definition_stack[-1].ModifierText =3D = self.input.toString(d.start, d.stop) else: self.function_definition_stack[-1].ModifierText =3D = '' - self.function_definition_stack[-1].DeclText =3D self.i= nput.toString(declarator1.start,declarator1.stop) + self.function_definition_stack[-1].DeclText =3D self.i= nput.toString(declarator1.start, declarator1.stop) self.function_definition_stack[-1].DeclLine =3D declar= ator1.start.line self.function_definition_stack[-1].DeclOffset =3D decl= arator1.start.charPositionInLine if a is not None: @@ -922,9 +922,9 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if b is not None: - self.StoreTypedefDefinition(a.line, a.charPositi= onInLine, d.line, d.charPositionInLine, self.input.toString(b.start,b.stop)= , self.input.toString(c.start,c.stop)) + self.StoreTypedefDefinition(a.line, a.charPositi= onInLine, d.line, d.charPositionInLine, self.input.toString(b.start, b.stop= ), self.input.toString(c.start, c.stop)) else: - self.StoreTypedefDefinition(a.line, a.charPositi= onInLine, d.line, d.charPositionInLine, '', self.input.toString(c.start,c.s= top)) + self.StoreTypedefDefinition(a.line, a.charPositi= onInLine, d.line, d.charPositionInLine, '', self.input.toString(c.start, c.= stop)) =20 =20 =20 @@ -959,7 +959,7 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if t is not None: - self.StoreVariableDeclaration(s.start.line, s.st= art.charPositionInLine, t.start.line, t.start.charPositionInLine, self.inpu= t.toString(s.start,s.stop), self.input.toString(t.start,t.stop)) + self.StoreVariableDeclaration(s.start.line, s.st= art.charPositionInLine, t.start.line, t.start.charPositionInLine, self.inpu= t.toString(s.start, s.stop), self.input.toString(t.start, t.stop)) =09 =20 =20 @@ -1403,7 +1403,7 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if s.stop is not None: - self.StoreStructUnionDefinition(s.start.line, s.= start.charPositionInLine, s.stop.line, s.stop.charPositionInLine, self.inpu= t.toString(s.start,s.stop)) + self.StoreStructUnionDefinition(s.start.line, s.= start.charPositionInLine, s.stop.line, s.stop.charPositionInLine, self.inpu= t.toString(s.start, s.stop)) =09 =20 =20 @@ -1418,7 +1418,7 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if e.stop is not None: - self.StoreEnumerationDefinition(e.start.line, e.= start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.inpu= t.toString(e.start,e.stop)) + self.StoreEnumerationDefinition(e.start.line, e.= start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.inpu= t.toString(e.start, e.stop)) =09 =20 =20 @@ -5401,7 +5401,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.postfix_expression_stack[-1].FuncCallText +=3D se= lf.input.toString(p.start,p.stop) + self.postfix_expression_stack[-1].FuncCallText +=3D se= lf.input.toString(p.start, p.stop) =20 # C.g:407:9: ( '[' expression ']' | '(' a=3D ')' | '(' c= =3D argument_expression_list b=3D ')' | '(' macro_parameter_list ')' | '.' = x=3D IDENTIFIER | '*' y=3D IDENTIFIER | '->' z=3D IDENTIFIER | '++' | '--' = )* while True: #loop65 @@ -5501,7 +5501,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StoreFunctionCalling(p.start.line, p.star= t.charPositionInLine, b.line, b.charPositionInLine, self.postfix_expression= _stack[-1].FuncCallText, self.input.toString(c.start,c.stop)) + self.StoreFunctionCalling(p.start.line, p.star= t.charPositionInLine, b.line, b.charPositionInLine, self.postfix_expression= _stack[-1].FuncCallText, self.input.toString(c.start, c.stop)) =20 =20 =20 @@ -8277,7 +8277,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 =20 =20 @@ -16384,7 +16384,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 self.following.append(self.FOLLOW_statement_in_selecti= on_statement2284) self.statement() @@ -16503,7 +16503,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 =20 =20 @@ -16535,7 +16535,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 =20 =20 @@ -16582,7 +16582,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 =20 =20 diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.p= y b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py index d22945434711..38662c929293 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py @@ -562,7 +562,7 @@ class InfParser(MetaFileParser): NmakeLine =3D '' =20 # section content - self._ValueList =3D ['','',''] + self._ValueList =3D ['', '', ''] # parse current line, result will be put in self._ValueList self._SectionParser[self._SectionType](self) if self._ValueList is None or self._ItemType =3D=3D MODEL_META= _DATA_DEFINE: @@ -921,7 +921,7 @@ class DscParser(MetaFileParser): =20 ## Directive statement parser def _DirectiveParser(self): - self._ValueList =3D ['','',''] + self._ValueList =3D ['', '', ''] TokenList =3D GetSplitValueList(self._CurrentLine, ' ', 1) self._ValueList[0:len(TokenList)] =3D TokenList =20 @@ -1111,7 +1111,7 @@ class DscParser(MetaFileParser): =20 ## Override parent's method since we'll do all macro replacements in p= arser def _GetMacros(self): - Macros =3D dict( [('ARCH','IA32'), ('FAMILY','MSFT'),('TOOL_CHAIN_= TAG','VS2008x86'),('TARGET','DEBUG')]) + Macros =3D dict( [('ARCH', 'IA32'), ('FAMILY', 'MSFT'), ('TOOL_CHA= IN_TAG', 'VS2008x86'), ('TARGET', 'DEBUG')]) Macros.update(self._FileLocalMacros) Macros.update(self._GetApplicableSectionMacro()) Macros.update(GlobalData.gEdkGlobal) @@ -1226,7 +1226,7 @@ class DscParser(MetaFileParser): self._RawTable.Drop() self._Table.Drop() for Record in RecordList: - EccGlobalData.gDb.TblDsc.Insert(Record[1],Record[2],Record[3],= Record[4],Record[5],Record[6],Record[7],Record[8],Record[9],Record[10],Reco= rd[11],Record[12],Record[13],Record[14]) + EccGlobalData.gDb.TblDsc.Insert(Record[1], Record[2], Record[3= ], Record[4], Record[5], Record[6], Record[7], Record[8], Record[9], Record= [10], Record[11], Record[12], Record[13], Record[14]) GlobalData.gPlatformDefines.update(self._FileLocalMacros) self._PostProcessed =3D True self._Content =3D None @@ -1247,7 +1247,7 @@ class DscParser(MetaFileParser): =20 def __RetrievePcdValue(self): Records =3D self._RawTable.Query(MODEL_PCD_FEATURE_FLAG, BelongsTo= Item=3D-1.0) - for TokenSpaceGuid,PcdName,Value,Dummy2,Dummy3,ID,Line in Records: + for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, ID, Line in Re= cords: Value, DatumType, MaxDatumSize =3D AnalyzePcdData(Value) # Only use PCD whose value is straitforward (no macro and PCD) if self.SymbolPattern.findall(Value): @@ -1260,7 +1260,7 @@ class DscParser(MetaFileParser): self._Symbols[Name] =3D Value =20 Records =3D self._RawTable.Query(MODEL_PCD_FIXED_AT_BUILD, Belongs= ToItem=3D-1.0) - for TokenSpaceGuid,PcdName,Value,Dummy2,Dummy3,ID,Line in Records: + for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, ID, Line in Re= cords: Value, DatumType, MaxDatumSize =3D AnalyzePcdData(Value) # Only use PCD whose value is straitforward (no macro and PCD) if self.SymbolPattern.findall(Value): @@ -1572,7 +1572,7 @@ class DecParser(MetaFileParser): continue =20 # section content - self._ValueList =3D ['','',''] + self._ValueList =3D ['', '', ''] self._SectionParser[self._SectionType[0]](self) if self._ValueList is None or self._ItemType =3D=3D MODEL_META= _DATA_DEFINE: self._ItemType =3D -1 @@ -1718,7 +1718,7 @@ class DecParser(MetaFileParser): GuidValue =3D GuidValue.lstrip(' {') HexList.append('0x' + str(GuidValue[2:])) Index +=3D 1 - self._ValueList[1] =3D "{ %s, %s, %s, { %s, %s, %s, %s, %s, %s= , %s, %s }}" % (HexList[0], HexList[1], HexList[2],HexList[3],HexList[4],He= xList[5],HexList[6],HexList[7],HexList[8],HexList[9],HexList[10]) + self._ValueList[1] =3D "{ %s, %s, %s, { %s, %s, %s, %s, %s, %s= , %s, %s }}" % (HexList[0], HexList[1], HexList[2], HexList[3], HexList[4],= HexList[5], HexList[6], HexList[7], HexList[8], HexList[9], HexList[10]) else: EdkLogger.error('Parser', FORMAT_INVALID, "Invalid GUID value = format", ExtraData=3Dself._CurrentLine + \ diff --git a/BaseTools/Source/Python/Eot/CParser.py b/BaseTools/Source/Pyth= on/Eot/CParser.py index 80cf278cf87c..51a05902e225 100644 --- a/BaseTools/Source/Python/Eot/CParser.py +++ b/BaseTools/Source/Python/Eot/CParser.py @@ -785,10 +785,10 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if d is not None: - self.function_definition_stack[-1].ModifierText =3D = self.input.toString(d.start,d.stop) + self.function_definition_stack[-1].ModifierText =3D = self.input.toString(d.start, d.stop) else: self.function_definition_stack[-1].ModifierText =3D = '' - self.function_definition_stack[-1].DeclText =3D self.i= nput.toString(declarator1.start,declarator1.stop) + self.function_definition_stack[-1].DeclText =3D self.i= nput.toString(declarator1.start, declarator1.stop) self.function_definition_stack[-1].DeclLine =3D declar= ator1.start.line self.function_definition_stack[-1].DeclOffset =3D decl= arator1.start.charPositionInLine if a is not None: @@ -922,9 +922,9 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if b is not None: - self.StoreTypedefDefinition(a.line, a.charPositi= onInLine, d.line, d.charPositionInLine, self.input.toString(b.start,b.stop)= , self.input.toString(c.start,c.stop)) + self.StoreTypedefDefinition(a.line, a.charPositi= onInLine, d.line, d.charPositionInLine, self.input.toString(b.start, b.stop= ), self.input.toString(c.start, c.stop)) else: - self.StoreTypedefDefinition(a.line, a.charPositi= onInLine, d.line, d.charPositionInLine, '', self.input.toString(c.start,c.s= top)) + self.StoreTypedefDefinition(a.line, a.charPositi= onInLine, d.line, d.charPositionInLine, '', self.input.toString(c.start, c.= stop)) =20 =20 =20 @@ -959,7 +959,7 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if t is not None: - self.StoreVariableDeclaration(s.start.line, s.st= art.charPositionInLine, t.start.line, t.start.charPositionInLine, self.inpu= t.toString(s.start,s.stop), self.input.toString(t.start,t.stop)) + self.StoreVariableDeclaration(s.start.line, s.st= art.charPositionInLine, t.start.line, t.start.charPositionInLine, self.inpu= t.toString(s.start, s.stop), self.input.toString(t.start, t.stop)) =09 =20 =20 @@ -1403,7 +1403,7 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if s.stop is not None: - self.StoreStructUnionDefinition(s.start.line, s.= start.charPositionInLine, s.stop.line, s.stop.charPositionInLine, self.inpu= t.toString(s.start,s.stop)) + self.StoreStructUnionDefinition(s.start.line, s.= start.charPositionInLine, s.stop.line, s.stop.charPositionInLine, self.inpu= t.toString(s.start, s.stop)) =09 =20 =20 @@ -1418,7 +1418,7 @@ class CParser(Parser): if self.backtracking =3D=3D 0: =20 if e.stop is not None: - self.StoreEnumerationDefinition(e.start.line, e.= start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.inpu= t.toString(e.start,e.stop)) + self.StoreEnumerationDefinition(e.start.line, e.= start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.inpu= t.toString(e.start, e.stop)) =09 =20 =20 @@ -5401,7 +5401,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.postfix_expression_stack[-1].FuncCallText +=3D se= lf.input.toString(p.start,p.stop) + self.postfix_expression_stack[-1].FuncCallText +=3D se= lf.input.toString(p.start, p.stop) =20 # C.g:407:9: ( '[' expression ']' | '(' a=3D ')' | '(' c= =3D argument_expression_list b=3D ')' | '(' macro_parameter_list ')' | '.' = x=3D IDENTIFIER | '*' y=3D IDENTIFIER | '->' z=3D IDENTIFIER | '++' | '--' = )* while True: #loop65 @@ -5501,7 +5501,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StoreFunctionCalling(p.start.line, p.star= t.charPositionInLine, b.line, b.charPositionInLine, self.postfix_expression= _stack[-1].FuncCallText, self.input.toString(c.start,c.stop)) + self.StoreFunctionCalling(p.start.line, p.star= t.charPositionInLine, b.line, b.charPositionInLine, self.postfix_expression= _stack[-1].FuncCallText, self.input.toString(c.start, c.stop)) =20 =20 =20 @@ -8277,7 +8277,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 =20 =20 @@ -16384,7 +16384,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 self.following.append(self.FOLLOW_statement_in_selecti= on_statement2284) self.statement() @@ -16503,7 +16503,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 =20 =20 @@ -16535,7 +16535,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 =20 =20 @@ -16582,7 +16582,7 @@ class CParser(Parser): if self.failed: return=20 if self.backtracking =3D=3D 0: - self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start,e.stop)) + self.StorePredicateExpression(e.start.line, e.star= t.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.to= String(e.start, e.stop)) =20 =20 =20 diff --git a/BaseTools/Source/Python/Eot/c.py b/BaseTools/Source/Python/Eot= /c.py index c70f62f393a9..ceefc952237f 100644 --- a/BaseTools/Source/Python/Eot/c.py +++ b/BaseTools/Source/Python/Eot/c.py @@ -128,11 +128,11 @@ def GetIdentifierList(): =20 for pp in FileProfile.PPDirectiveList: Type =3D GetIdType(pp.Content) - IdPP =3D DataClass.IdentifierClass(-1, '', '', '', pp.Content, Typ= e, -1, -1, pp.StartPos[0],pp.StartPos[1],pp.EndPos[0],pp.EndPos[1]) + IdPP =3D DataClass.IdentifierClass(-1, '', '', '', pp.Content, Typ= e, -1, -1, pp.StartPos[0], pp.StartPos[1], pp.EndPos[0], pp.EndPos[1]) IdList.append(IdPP) =20 for ae in FileProfile.AssignmentExpressionList: - IdAE =3D DataClass.IdentifierClass(-1, ae.Operator, '', ae.Name, a= e.Value, DataClass.MODEL_IDENTIFIER_ASSIGNMENT_EXPRESSION, -1, -1, ae.Start= Pos[0],ae.StartPos[1],ae.EndPos[0],ae.EndPos[1]) + IdAE =3D DataClass.IdentifierClass(-1, ae.Operator, '', ae.Name, a= e.Value, DataClass.MODEL_IDENTIFIER_ASSIGNMENT_EXPRESSION, -1, -1, ae.Start= Pos[0], ae.StartPos[1], ae.EndPos[0], ae.EndPos[1]) IdList.append(IdAE) =20 FuncDeclPattern =3D GetFuncDeclPattern() @@ -154,7 +154,7 @@ def GetIdentifierList(): var.Modifier +=3D ' ' + FuncNamePartList[Index] var.Declarator =3D var.Declarator.lstrip().lstrip(Func= NamePartList[Index]) Index +=3D 1 - IdVar =3D DataClass.IdentifierClass(-1, var.Modifier, '', var.= Declarator, '', DataClass.MODEL_IDENTIFIER_FUNCTION_DECLARATION, -1, -1, va= r.StartPos[0],var.StartPos[1],var.EndPos[0],var.EndPos[1]) + IdVar =3D DataClass.IdentifierClass(-1, var.Modifier, '', var.= Declarator, '', DataClass.MODEL_IDENTIFIER_FUNCTION_DECLARATION, -1, -1, va= r.StartPos[0], var.StartPos[1], var.EndPos[0], var.EndPos[1]) IdList.append(IdVar) continue =20 @@ -167,7 +167,7 @@ def GetIdentifierList(): var.Modifier +=3D ' ' + Name[LSBPos:] Name =3D Name[0:LSBPos] =20 - IdVar =3D DataClass.IdentifierClass(-1, var.Modifier, '', = Name, (len(DeclList) > 1 and [DeclList[1]]or [''])[0], DataClass.MODEL_IDEN= TIFIER_VARIABLE, -1, -1, var.StartPos[0],var.StartPos[1],var.EndPos[0],var.= EndPos[1]) + IdVar =3D DataClass.IdentifierClass(-1, var.Modifier, '', = Name, (len(DeclList) > 1 and [DeclList[1]]or [''])[0], DataClass.MODEL_IDEN= TIFIER_VARIABLE, -1, -1, var.StartPos[0], var.StartPos[1], var.EndPos[0], v= ar.EndPos[1]) IdList.append(IdVar) else: DeclList =3D var.Declarator.split('=3D') @@ -176,7 +176,7 @@ def GetIdentifierList(): LSBPos =3D var.Declarator.find('[') var.Modifier +=3D ' ' + Name[LSBPos:] Name =3D Name[0:LSBPos] - IdVar =3D DataClass.IdentifierClass(-1, var.Modifier, '', Name= , (len(DeclList) > 1 and [DeclList[1]]or [''])[0], DataClass.MODEL_IDENTIFI= ER_VARIABLE, -1, -1, var.StartPos[0],var.StartPos[1],var.EndPos[0],var.EndP= os[1]) + IdVar =3D DataClass.IdentifierClass(-1, var.Modifier, '', Name= , (len(DeclList) > 1 and [DeclList[1]]or [''])[0], DataClass.MODEL_IDENTIFI= ER_VARIABLE, -1, -1, var.StartPos[0], var.StartPos[1], var.EndPos[0], var.E= ndPos[1]) IdList.append(IdVar) =20 for enum in FileProfile.EnumerationDefinitionList: @@ -184,7 +184,7 @@ def GetIdentifierList(): RBPos =3D enum.Content.find('}') Name =3D enum.Content[4:LBPos].strip() Value =3D enum.Content[LBPos+1:RBPos] - IdEnum =3D DataClass.IdentifierClass(-1, '', '', Name, Value, Data= Class.MODEL_IDENTIFIER_ENUMERATE, -1, -1, enum.StartPos[0],enum.StartPos[1]= ,enum.EndPos[0],enum.EndPos[1]) + IdEnum =3D DataClass.IdentifierClass(-1, '', '', Name, Value, Data= Class.MODEL_IDENTIFIER_ENUMERATE, -1, -1, enum.StartPos[0], enum.StartPos[1= ], enum.EndPos[0], enum.EndPos[1]) IdList.append(IdEnum) =20 for su in FileProfile.StructUnionDefinitionList: @@ -201,7 +201,7 @@ def GetIdentifierList(): else: Name =3D su.Content[SkipLen:LBPos].strip() Value =3D su.Content[LBPos+1:RBPos] - IdPE =3D DataClass.IdentifierClass(-1, '', '', Name, Value, Type, = -1, -1, su.StartPos[0],su.StartPos[1],su.EndPos[0],su.EndPos[1]) + IdPE =3D DataClass.IdentifierClass(-1, '', '', Name, Value, Type, = -1, -1, su.StartPos[0], su.StartPos[1], su.EndPos[0], su.EndPos[1]) IdList.append(IdPE) =20 TdFuncPointerPattern =3D GetTypedefFuncPointerPattern() @@ -224,11 +224,11 @@ def GetIdentifierList(): Name =3D TmpStr[0:RBPos] Value =3D 'FP' + TmpStr[RBPos + 1:] =20 - IdTd =3D DataClass.IdentifierClass(-1, Modifier, '', Name, Value, = DataClass.MODEL_IDENTIFIER_TYPEDEF, -1, -1, td.StartPos[0],td.StartPos[1],t= d.EndPos[0],td.EndPos[1]) + IdTd =3D DataClass.IdentifierClass(-1, Modifier, '', Name, Value, = DataClass.MODEL_IDENTIFIER_TYPEDEF, -1, -1, td.StartPos[0], td.StartPos[1],= td.EndPos[0], td.EndPos[1]) IdList.append(IdTd) =20 for funcCall in FileProfile.FunctionCallingList: - IdFC =3D DataClass.IdentifierClass(-1, '', '', funcCall.FuncName, = funcCall.ParamList, DataClass.MODEL_IDENTIFIER_FUNCTION_CALLING, -1, -1, fu= ncCall.StartPos[0],funcCall.StartPos[1],funcCall.EndPos[0],funcCall.EndPos[= 1]) + IdFC =3D DataClass.IdentifierClass(-1, '', '', funcCall.FuncName, = funcCall.ParamList, DataClass.MODEL_IDENTIFIER_FUNCTION_CALLING, -1, -1, fu= ncCall.StartPos[0], funcCall.StartPos[1], funcCall.EndPos[0], funcCall.EndP= os[1]) IdList.append(IdFC) return IdList =20 @@ -330,7 +330,7 @@ def GetFunctionList(): FuncDef.Modifier +=3D ' ' + FuncNamePartList[Index] Index +=3D 1 =20 - FuncObj =3D DataClass.FunctionClass(-1, FuncDef.Declarator, FuncDe= f.Modifier, FuncName.strip(), '', FuncDef.StartPos[0],FuncDef.StartPos[1],F= uncDef.EndPos[0],FuncDef.EndPos[1], FuncDef.LeftBracePos[0], FuncDef.LeftBr= acePos[1], -1, ParamIdList, []) + FuncObj =3D DataClass.FunctionClass(-1, FuncDef.Declarator, FuncDe= f.Modifier, FuncName.strip(), '', FuncDef.StartPos[0], FuncDef.StartPos[1],= FuncDef.EndPos[0], FuncDef.EndPos[1], FuncDef.LeftBracePos[0], FuncDef.Lef= tBracePos[1], -1, ParamIdList, []) FuncObjList.append(FuncObj) =20 return FuncObjList diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/S= ource/Python/GenFds/AprioriSection.py index decc0dd7c98d..1288349c7c4b 100644 --- a/BaseTools/Source/Python/GenFds/AprioriSection.py +++ b/BaseTools/Source/Python/GenFds/AprioriSection.py @@ -23,7 +23,7 @@ import FfsFileStatement from GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import AprioriSectionClassObject from Common.StringUtils import * -from Common.Misc import SaveFileOnChange,PathClass +from Common.Misc import SaveFileOnChange, PathClass from Common import EdkLogger from Common.BuildToolError import * from Common.DataType import TAB_COMMON diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Sour= ce/Python/GenFds/CapsuleData.py index b376d6b2e9be..9dc55e5dbf7b 100644 --- a/BaseTools/Source/Python/GenFds/CapsuleData.py +++ b/BaseTools/Source/Python/GenFds/CapsuleData.py @@ -207,7 +207,7 @@ class CapsulePayload(CapsuleData): # Guid =3D self.ImageTypeId.split('-') Buffer =3D pack('=3DILHHBBBBBBBBBBBBIIQ', - int(self.Version,16), + int(self.Version, 16), int(Guid[0], 16),=20 int(Guid[1], 16),=20 int(Guid[2], 16),=20 diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Sourc= e/Python/GenFds/EfiSection.py index 5405d0a8da13..8ac37dd96b9b 100644 --- a/BaseTools/Source/Python/GenFds/EfiSection.py +++ b/BaseTools/Source/Python/GenFds/EfiSection.py @@ -133,7 +133,7 @@ class EfiSection (EfiSectionClassObject): elif FileList !=3D []: for File in FileList: Index =3D Index + 1 - Num =3D '%s.%d' %(SecNum , Index) + Num =3D '%s.%d' %(SecNum, Index) OutputFile =3D os.path.join(OutputPath, ModuleName + S= UP_MODULE_SEC + Num + Ffs.SectionSuffix.get(SectionType)) f =3D open(File, 'r') VerString =3D f.read() @@ -192,7 +192,7 @@ class EfiSection (EfiSectionClassObject): elif FileList !=3D []: for File in FileList: Index =3D Index + 1 - Num =3D '%s.%d' %(SecNum , Index) + Num =3D '%s.%d' %(SecNum, Index) OutputFile =3D os.path.join(OutputPath, ModuleName + S= UP_MODULE_SEC + Num + Ffs.SectionSuffix.get(SectionType)) f =3D open(File, 'r') UiString =3D f.read() @@ -237,7 +237,7 @@ class EfiSection (EfiSectionClassObject): for File in FileList: """ Copy Map file to FFS output path """ Index =3D Index + 1 - Num =3D '%s.%d' %(SecNum , Index) + Num =3D '%s.%d' %(SecNum, Index) OutputFile =3D os.path.join( OutputPath, ModuleName + = SUP_MODULE_SEC + Num + Ffs.SectionSuffix.get(SectionType)) File =3D GenFdsGlobalVariable.MacroExtend(File, Dict) =20 diff --git a/BaseTools/Source/Python/GenFds/Fd.py b/BaseTools/Source/Python= /GenFds/Fd.py index 188ca28cd7ce..b2a14a1e1313 100644 --- a/BaseTools/Source/Python/GenFds/Fd.py +++ b/BaseTools/Source/Python/GenFds/Fd.py @@ -137,7 +137,7 @@ class FD(FDClassObject): # Call each region's AddToBuffer function # GenFdsGlobalVariable.VerboseLogger('Call each region\'s AddToB= uffer function') - RegionObj.AddToBuffer (FdBuffer, self.BaseAddress, self.BlockS= izeList, self.ErasePolarity, GenFds.ImageBinDict, self.vtfRawDict, self.Def= ineVarDict,Flag=3DFlag) + RegionObj.AddToBuffer (FdBuffer, self.BaseAddress, self.BlockS= izeList, self.ErasePolarity, GenFds.ImageBinDict, self.vtfRawDict, self.Def= ineVarDict, Flag=3DFlag) # # Write the buffer contents to Fd file # @@ -163,7 +163,7 @@ class FD(FDClassObject): if len(RegionObj.RegionDataList) =3D=3D 1: RegionData =3D RegionObj.RegionDataList[0] FvList.append(RegionData.upper()) - FvAddDict[RegionData.upper()] =3D (int(self.BaseAddres= s,16) + \ + FvAddDict[RegionData.upper()] =3D (int(self.BaseAddres= s, 16) + \ RegionObj.Offset, RegionOb= j.Size) else: Offset =3D RegionObj.Offset @@ -178,7 +178,7 @@ class FD(FDClassObject): Size =3D 0 for blockStatement in FvObj.BlockSizeList: Size =3D Size + blockStatement[0] * blockS= tatement[1] - FvAddDict[RegionData.upper()] =3D (int(self.Ba= seAddress,16) + \ + FvAddDict[RegionData.upper()] =3D (int(self.Ba= seAddress, 16) + \ Offset, Size) Offset =3D Offset + Size # diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index a61837e27b31..88ba70b400d2 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -1808,7 +1808,7 @@ class FdfParser: return long( ValueExpression(Expr, self.__CollectMacroPcd() - )(True),0) + )(True), 0) except Exception: self.SetFileBufferPos(StartPos) return None @@ -2718,7 +2718,7 @@ class FdfParser: while True: AlignValue =3D None if self.__GetAlignment(): - if self.__Token not in ("Auto", "8", "16", "32", "64", "12= 8", "512", "1K", "4K", "32K" ,"64K", "128K", + if self.__Token not in ("Auto", "8", "16", "32", "64", "12= 8", "512", "1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4M", = "8M", "16M"): raise Warning("Incorrect alignment '%s'" % self.__Toke= n, self.FileName, self.CurrentLineNumber) #For FFS, Auto is default option same to "" @@ -2777,7 +2777,7 @@ class FdfParser: FfsFileObj.CheckSum =3D True =20 if self.__GetAlignment(): - if self.__Token not in ("Auto", "8", "16", "32", "64", "128", = "512", "1K", "4K", "32K" ,"64K", "128K", + if self.__Token not in ("Auto", "8", "16", "32", "64", "128", = "512", "1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4M", "8M"= , "16M"): raise Warning("Incorrect alignment '%s'" % self.__Token, s= elf.FileName, self.CurrentLineNumber) #For FFS, Auto is default option same to "" @@ -2849,7 +2849,7 @@ class FdfParser: =20 AlignValue =3D None if self.__GetAlignment(): - if self.__Token not in ("Auto", "8", "16", "32", "64", "128", = "512", "1K", "4K", "32K" ,"64K", "128K", + if self.__Token not in ("Auto", "8", "16", "32", "64", "128", = "512", "1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4M", "8M"= , "16M"): raise Warning("Incorrect alignment '%s'" % self.__Token, s= elf.FileName, self.CurrentLineNumber) AlignValue =3D self.__Token @@ -3139,7 +3139,7 @@ class FdfParser: =20 AlignValue =3D None if self.__GetAlignment(): - if self.__Token not in ("8", "16", "32", "64", "128", "512", "= 1K", "4K", "32K" ,"64K", "128K", + if self.__Token not in ("8", "16", "32", "64", "128", "512", "= 1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4M", "8M"= , "16M"): raise Warning("Incorrect alignment '%s'" % self.__Token, s= elf.FileName, self.CurrentLineNumber) AlignValue =3D self.__Token @@ -3532,7 +3532,7 @@ class FdfParser: AfileName =3D self.__Token AfileBaseName =3D os.path.basename(AfileName) =20 - if os.path.splitext(AfileBaseName)[1] not in [".bin",".BIN",".Bin= ",".dat",".DAT",".Dat",".data",".DATA",".Data"]: + if os.path.splitext(AfileBaseName)[1] not in [".bin", ".BIN", ".B= in", ".dat", ".DAT", ".Dat", ".data", ".DATA", ".Data"]: raise Warning('invalid binary file type, should be one of "bin= ",BINARY_FILE_TYPE_BIN,"Bin","dat","DAT","Dat","data","DATA","Data"', \ self.FileName, self.CurrentLineNumber) =20 @@ -3729,7 +3729,7 @@ class FdfParser: =20 AlignValue =3D "" if self.__GetAlignment(): - if self.__Token not in ("Auto", "8", "16", "32", "64", "128", = "512", "1K", "4K", "32K" ,"64K", "128K", + if self.__Token not in ("Auto", "8", "16", "32", "64", "128", = "512", "1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4M", "8M"= , "16M"): raise Warning("Incorrect alignment '%s'" % self.__Token, s= elf.FileName, self.CurrentLineNumber) #For FFS, Auto is default option same to "" @@ -3779,7 +3779,7 @@ class FdfParser: =20 SectAlignment =3D "" if self.__GetAlignment(): - if self.__Token not in ("Auto", "8", "16", "32", "64", "12= 8", "512", "1K", "4K", "32K" ,"64K", "128K", + if self.__Token not in ("Auto", "8", "16", "32", "64", "12= 8", "512", "1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4M", = "8M", "16M"): raise Warning("Incorrect alignment '%s'" % self.__Toke= n, self.FileName, self.CurrentLineNumber) if self.__Token =3D=3D 'Auto' and (not SectionName =3D=3D = BINARY_FILE_TYPE_PE32) and (not SectionName =3D=3D BINARY_FILE_TYPE_TE): @@ -3859,7 +3859,7 @@ class FdfParser: FvImageSectionObj.FvFileType =3D self.__Token =20 if self.__GetAlignment(): - if self.__Token not in ("8", "16", "32", "64", "128", = "512", "1K", "4K", "32K" ,"64K", "128K", + if self.__Token not in ("8", "16", "32", "64", "128", = "512", "1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4= M", "8M", "16M"): raise Warning("Incorrect alignment '%s'" % self.__= Token, self.FileName, self.CurrentLineNumber) FvImageSectionObj.Alignment =3D self.__Token @@ -3927,7 +3927,7 @@ class FdfParser: EfiSectionObj.BuildNum =3D self.__Token =20 if self.__GetAlignment(): - if self.__Token not in ("Auto", "8", "16", "32", "64", "128", = "512", "1K", "4K", "32K" ,"64K", "128K", + if self.__Token not in ("Auto", "8", "16", "32", "64", "128", = "512", "1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4M", "8M"= , "16M"): raise Warning("Incorrect alignment '%s'" % self.__Token, s= elf.FileName, self.CurrentLineNumber) if self.__Token =3D=3D 'Auto' and (not SectionName =3D=3D BINA= RY_FILE_TYPE_PE32) and (not SectionName =3D=3D BINARY_FILE_TYPE_TE): @@ -4667,7 +4667,7 @@ class FdfParser: FvInFdList =3D self.__GetFvInFd(RefFdName) if FvInFdList !=3D []: for FvNameInFd in FvInFdList: - LogStr +=3D "FD %s contains FV %s\n" % (RefFdN= ame,FvNameInFd) + LogStr +=3D "FD %s contains FV %s\n" % (RefFdN= ame, FvNameInFd) if FvNameInFd not in RefFvStack: RefFvStack.append(FvNameInFd) =20 @@ -4723,7 +4723,7 @@ class FdfParser: CapInFdList =3D self.__GetCapInFd(RefFdName) if CapInFdList !=3D []: for CapNameInFd in CapInFdList: - LogStr +=3D "FD %s contains Capsule %s\n" = % (RefFdName,CapNameInFd) + LogStr +=3D "FD %s contains Capsule %s\n" = % (RefFdName, CapNameInFd) if CapNameInFd not in RefCapStack: RefCapStack.append(CapNameInFd) =20 @@ -4734,7 +4734,7 @@ class FdfParser: FvInFdList =3D self.__GetFvInFd(RefFdName) if FvInFdList !=3D []: for FvNameInFd in FvInFdList: - LogStr +=3D "FD %s contains FV %s\n" % (Re= fFdName,FvNameInFd) + LogStr +=3D "FD %s contains FV %s\n" % (Re= fFdName, FvNameInFd) if FvNameInFd not in RefFvList: RefFvList.append(FvNameInFd) =20 diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/= Source/Python/GenFds/FfsInfStatement.py index b26821b29052..9eb99d659bfd 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -293,7 +293,7 @@ class FfsInfStatement(FfsInfStatementClassObject): try: Pcd.InfDefaultValue =3D ValueExpressionEx(Pcd.InfDefau= ltValue, Pcd.DatumType, Platform._GuidDict)(True) except BadExpression: - EdkLogger.error("GenFds", GENFDS_ERROR, 'PCD [%s.%s] V= alue "%s"' %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DefaultValue),Fil= e=3Dself.InfFileName) + EdkLogger.error("GenFds", GENFDS_ERROR, 'PCD [%s.%s] V= alue "%s"' %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DefaultValue), Fi= le=3Dself.InfFileName) =20 # Check value, if value are equal, no need to patch if Pcd.DatumType =3D=3D TAB_VOID: @@ -446,7 +446,7 @@ class FfsInfStatement(FfsInfStatementClassObject): =20 self.__InfParse__(Dict) Arch =3D self.GetCurrentArch() - SrcFile =3D mws.join( GenFdsGlobalVariable.WorkSpaceDir , self.Inf= FileName); + SrcFile =3D mws.join( GenFdsGlobalVariable.WorkSpaceDir, self.InfF= ileName); DestFile =3D os.path.join( self.OutputPath, self.ModuleGuid + '.ff= s') =20 SrcFileDir =3D "." @@ -694,13 +694,13 @@ class FfsInfStatement(FfsInfStatementClassObject): Arch =3D self.CurrentArch =20 OutputPath =3D os.path.join(GenFdsGlobalVariable.OutputDirDict[Arc= h], - Arch , + Arch, ModulePath, FileName, 'OUTPUT' ) DebugPath =3D os.path.join(GenFdsGlobalVariable.OutputDirDict[Arch= ], - Arch , + Arch, ModulePath, FileName, 'DEBUG' @@ -962,9 +962,9 @@ class FfsInfStatement(FfsInfStatementClassObject): Sect.FvParentAddr =3D FvParentAddr =20 if Rule.KeyStringList !=3D []: - SectList, Align =3D Sect.GenSection(self.OutputPath , self= .ModuleGuid, SecIndex, Rule.KeyStringList, self, IsMakefile =3D IsMakefile) + SectList, Align =3D Sect.GenSection(self.OutputPath, self.= ModuleGuid, SecIndex, Rule.KeyStringList, self, IsMakefile =3D IsMakefile) else : - SectList, Align =3D Sect.GenSection(self.OutputPath , self= .ModuleGuid, SecIndex, self.KeyStringList, self, IsMakefile =3D IsMakefile) + SectList, Align =3D Sect.GenSection(self.OutputPath, self.= ModuleGuid, SecIndex, self.KeyStringList, self, IsMakefile =3D IsMakefile) =20 if not HasGeneratedFlag: UniVfrOffsetFileSection =3D "" =20 @@ -1121,7 +1121,7 @@ class FfsInfStatement(FfsInfStatementClassObject): try : SaveFileOnChange(UniVfrOffsetFileName, fStringIO.getvalue()) except: - EdkLogger.error("GenFds", FILE_WRITE_FAILURE, "Write data to f= ile %s failed, please check whether the file been locked or using by other = applications." %UniVfrOffsetFileName,None) + EdkLogger.error("GenFds", FILE_WRITE_FAILURE, "Write data to f= ile %s failed, please check whether the file been locked or using by other = applications." %UniVfrOffsetFileName, None) =20 fStringIO.close () =20 diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python= /GenFds/Fv.py index 21c2579f0b51..93bf05e40667 100644 --- a/BaseTools/Source/Python/GenFds/Fv.py +++ b/BaseTools/Source/Python/GenFds/Fv.py @@ -380,8 +380,8 @@ class FV (FvClassObject): # check if the file path exists or not if not os.path.isfile(FileFullPath): GenFdsGlobalVariable.ErrorLogger("Error opening FV= Extension Header Entry file %s." % (self.FvExtEntryData[Index])) - FvExtFile =3D open (FileFullPath,'rb') - FvExtFile.seek(0,2) + FvExtFile =3D open (FileFullPath, 'rb') + FvExtFile.seek(0, 2) Size =3D FvExtFile.tell() if Size >=3D 0x10000: GenFdsGlobalVariable.ErrorLogger("The size of FV E= xtension Header Entry file %s exceeds 0x10000." % (self.FvExtEntryData[Inde= x])) diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/S= ource/Python/GenFds/FvImageSection.py index 3a4d8fb91b70..77bf6a700623 100644 --- a/BaseTools/Source/Python/GenFds/FvImageSection.py +++ b/BaseTools/Source/Python/GenFds/FvImageSection.py @@ -65,7 +65,7 @@ class FvImageSection(FvImageSectionClassObject): for FvFileName in FileList: FvAlignmentValue =3D 0 if os.path.isfile(FvFileName): - FvFileObj =3D open (FvFileName,'rb') + FvFileObj =3D open (FvFileName, 'rb') FvFileObj.seek(0) # PI FvHeader is 0x48 byte FvHeaderBuffer =3D FvFileObj.read(0x48) @@ -113,7 +113,7 @@ class FvImageSection(FvImageSectionClassObject): if self.FvFileName is not None: FvFileName =3D GenFdsGlobalVariable.ReplaceWorkspaceMa= cro(self.FvFileName) if os.path.isfile(FvFileName): - FvFileObj =3D open (FvFileName,'rb') + FvFileObj =3D open (FvFileName, 'rb') FvFileObj.seek(0) # PI FvHeader is 0x48 byte FvHeaderBuffer =3D FvFileObj.read(0x48) diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseT= ools/Source/Python/GenFds/GenFdsGlobalVariable.py index 3388d5b098a8..19a5f5afbc89 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -342,7 +342,7 @@ class GenFdsGlobalVariable: for Arch in ArchList: GenFdsGlobalVariable.OutputDirDict[Arch] =3D os.path.normpath( os.path.join(GlobalData.gWorkspace, - WorkSpace.Db.BuildObject[GenFdsGlobalVariable= .ActivePlatform, Arch,GlobalData.gGlobalDefines['TARGET'], + WorkSpace.Db.BuildObject[GenFdsGlobalVariable= .ActivePlatform, Arch, GlobalData.gGlobalDefines['TARGET'], GlobalData.gGlobalDefines['TOOLCHAIN']].Outpu= tDirectory, GlobalData.gGlobalDefines['TARGET'] +'_' + Gl= obalData.gGlobalDefines['TOOLCHAIN'])) GenFdsGlobalVariable.OutputDirFromDscDict[Arch] =3D os.path.no= rmpath( @@ -548,7 +548,7 @@ class GenFdsGlobalVariable: =20 GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs upda= te because of newer %s" % (Output, Input)) if MakefilePath: - if (tuple(Cmd),tuple(GenFdsGlobalVariable.SecCmdList),tuple(Ge= nFdsGlobalVariable.CopyList)) not in GenFdsGlobalVariable.FfsCmdDict: + if (tuple(Cmd), tuple(GenFdsGlobalVariable.SecCmdList), tuple(= GenFdsGlobalVariable.CopyList)) not in GenFdsGlobalVariable.FfsCmdDict: GenFdsGlobalVariable.FfsCmdDict[tuple(Cmd), tuple(GenFdsGl= obalVariable.SecCmdList), tuple(GenFdsGlobalVariable.CopyList)] =3D Makefil= ePath GenFdsGlobalVariable.SecCmdList =3D [] GenFdsGlobalVariable.CopyList =3D [] diff --git a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py b= /BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py index d7084fbe88da..9645e9b08db4 100644 --- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py +++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py @@ -110,7 +110,7 @@ def _parseForGCC(lines, efifilepath): PcdName =3D m.groups(0)[0] m =3D pcdPatternGcc.match(lines[index + 1].strip()) if m is not None: - bpcds.append((PcdName, int(m.groups(0)[0], 16) , i= nt(sections[-1][1], 16), sections[-1][0])) + bpcds.append((PcdName, int(m.groups(0)[0], 16), in= t(sections[-1][1], 16), sections[-1][0])) =20 # get section information from efi file efisecs =3D PeImageClass(efifilepath).SectionHeaderList diff --git a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py b/BaseTools/Sou= rce/Python/Pkcs7Sign/Pkcs7Sign.py index becf3e8eb9e8..1e07e23baeee 100644 --- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py +++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py @@ -89,7 +89,7 @@ if __name__ =3D=3D '__main__': parser.add_argument("--signature-size", dest=3D'SignatureSizeStr', type= =3Dstr, help=3D"specify the signature size for decode process.") parser.add_argument("-v", "--verbose", dest=3D'Verbose', action=3D"store= _true", help=3D"increase output messages") parser.add_argument("-q", "--quiet", dest=3D'Quiet', action=3D"store_tru= e", help=3D"reduce output messages") - parser.add_argument("--debug", dest=3D'Debug', type=3Dint, metavar=3D'[0= -9]', choices=3Dlist(range(0,10)), default=3D0, help=3D"set debug level") + parser.add_argument("--debug", dest=3D'Debug', type=3Dint, metavar=3D'[0= -9]', choices=3Dlist(range(0, 10)), default=3D0, help=3D"set debug level") parser.add_argument(metavar=3D"input_file", dest=3D'InputFile', type=3Da= rgparse.FileType('rb'), help=3D"specify the input filename") =20 # diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Generat= eKeys.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateK= eys.py index ca0093bf117e..170fed98e5f1 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py @@ -52,7 +52,7 @@ if __name__ =3D=3D '__main__': parser.add_argument("--public-key-hash-c", dest=3D'PublicKeyHashCFile', = type=3Dargparse.FileType('wb'), help=3D"specify the public key hash filenam= e that is SHA 256 hash of 2048 bit RSA public key in C structure format") parser.add_argument("-v", "--verbose", dest=3D'Verbose', action=3D"store= _true", help=3D"increase output messages") parser.add_argument("-q", "--quiet", dest=3D'Quiet', action=3D"store_tru= e", help=3D"reduce output messages") - parser.add_argument("--debug", dest=3D'Debug', type=3Dint, metavar=3D'[0= -9]', choices=3Dlist(range(0,10)), default=3D0, help=3D"set debug level") + parser.add_argument("--debug", dest=3D'Debug', type=3Dint, metavar=3D'[0= -9]', choices=3Dlist(range(0, 10)), default=3D0, help=3D"set debug level") =20 # # Parse command line arguments diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py= b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py index ff9721d0deae..79ec8d7ef083 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py @@ -51,7 +51,7 @@ EFI_HASH_ALGORITHM_SHA256_GUID =3D uuid.UUID('{51aa59de-f= df2-4ea3-bc63-875fb7842ee # UINT8 Signature[256]; # } EFI_CERT_BLOCK_RSA_2048_SHA256; # -EFI_CERT_BLOCK_RSA_2048_SHA256 =3D collections.namedtuple('EFI_CERT= _BLOCK_RSA_2048_SHA256', ['HashType','PublicKey','Signature']) +EFI_CERT_BLOCK_RSA_2048_SHA256 =3D collections.namedtuple('EFI_CERT= _BLOCK_RSA_2048_SHA256', ['HashType', 'PublicKey', 'Signature']) EFI_CERT_BLOCK_RSA_2048_SHA256_STRUCT =3D struct.Struct('16s256s256s') =20 # @@ -72,7 +72,7 @@ if __name__ =3D=3D '__main__': parser.add_argument("--private-key", dest=3D'PrivateKeyFile', type=3Darg= parse.FileType('rb'), help=3D"specify the private key filename. If not spe= cified, a test signing key is used.") parser.add_argument("-v", "--verbose", dest=3D'Verbose', action=3D"store= _true", help=3D"increase output messages") parser.add_argument("-q", "--quiet", dest=3D'Quiet', action=3D"store_tru= e", help=3D"reduce output messages") - parser.add_argument("--debug", dest=3D'Debug', type=3Dint, metavar=3D'[0= -9]', choices=3Dlist(range(0,10)), default=3D0, help=3D"set debug level") + parser.add_argument("--debug", dest=3D'Debug', type=3Dint, metavar=3D'[0= -9]', choices=3Dlist(range(0, 10)), default=3D0, help=3D"set debug level") parser.add_argument(metavar=3D"input_file", dest=3D'InputFile', type=3Da= rgparse.FileType('rb'), help=3D"specify the input filename") =20 # @@ -156,7 +156,7 @@ if __name__ =3D=3D '__main__': PublicKeyHexString =3D Process.communicate()[0].split('=3D')[1].strip() PublicKey =3D '' while len(PublicKeyHexString) > 0: - PublicKey =3D PublicKey + chr(int(PublicKeyHexString[0:2],16)) + PublicKey =3D PublicKey + chr(int(PublicKeyHexString[0:2], 16)) PublicKeyHexString=3DPublicKeyHexString[2:] if Process.returncode !=3D 0: sys.exit(Process.returncode) diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/S= ource/Python/TargetTool/TargetTool.py index 0d4a59198e7b..ed567b870816 100644 --- a/BaseTools/Source/Python/TargetTool/TargetTool.py +++ b/BaseTools/Source/Python/TargetTool/TargetTool.py @@ -59,11 +59,11 @@ class TargetTool(): def ConvertTextFileToDict(self, FileName, CommentCharacter, KeySplitCh= aracter): """Convert a text file to a dictionary of (name:value) pairs.""" try: - f =3D open(FileName,'r') + f =3D open(FileName, 'r') for Line in f: if Line.startswith(CommentCharacter) or Line.strip() =3D= =3D '': continue - LineList =3D Line.split(KeySplitCharacter,1) + LineList =3D Line.split(KeySplitCharacter, 1) if len(LineList) >=3D 2: Key =3D LineList[0].strip() if Key.startswith(CommentCharacter) =3D=3D False and K= ey in self.TargetTxtDictionary: @@ -103,7 +103,7 @@ class TargetTool(): if Line.startswith(CommentCharacter) or Line.strip() =3D= =3D '': fw.write(Line) else: - LineList =3D Line.split(KeySplitCharacter,1) + LineList =3D Line.split(KeySplitCharacter, 1) if len(LineList) >=3D 2: Key =3D LineList[0].strip() if Key.startswith(CommentCharacter) =3D=3D False a= nd Key in self.TargetTxtDictionary: @@ -202,14 +202,14 @@ def RangeCheckCallback(option, opt_str, value, parser= ): parser.error("Option %s only allows one instance in command line!"= % option) =20 def MyOptionParser(): - parser =3D OptionParser(version=3D__version__,prog=3D"TargetTool.exe",= usage=3D__usage__,description=3D__copyright__) - parser.add_option("-a", "--arch", action=3D"append", type=3D"choice", = choices=3D['IA32','X64','IPF','EBC', 'ARM', 'AARCH64','0'], dest=3D"TARGET_= ARCH", + parser =3D OptionParser(version=3D__version__, prog=3D"TargetTool.exe"= , usage=3D__usage__, description=3D__copyright__) + parser.add_option("-a", "--arch", action=3D"append", type=3D"choice", = choices=3D['IA32', 'X64', 'IPF', 'EBC', 'ARM', 'AARCH64', '0'], dest=3D"TAR= GET_ARCH", help=3D"ARCHS is one of list: IA32, X64, IPF, ARM, AARCH64 or EBC,= which replaces target.txt's TARGET_ARCH definition. To specify more archs,= please repeat this option. 0 will clear this setting in target.txt and can= 't combine with other value.") parser.add_option("-p", "--platform", action=3D"callback", type=3D"str= ing", dest=3D"DSCFILE", callback=3DSingleCheckCallback, help=3D"Specify a DSC file, which replace target.txt's ACTIVE_PLAT= FORM definition. 0 will clear this setting in target.txt and can't combine = with other value.") parser.add_option("-c", "--tooldef", action=3D"callback", type=3D"stri= ng", dest=3D"TOOL_DEFINITION_FILE", callback=3DSingleCheckCallback, help=3D"Specify the WORKSPACE relative path of tool_def.txt file, = which replace target.txt's TOOL_CHAIN_CONF definition. 0 will clear this se= tting in target.txt and can't combine with other value.") - parser.add_option("-t", "--target", action=3D"append", type=3D"choice"= , choices=3D['DEBUG','RELEASE','0'], dest=3D"TARGET", + parser.add_option("-t", "--target", action=3D"append", type=3D"choice"= , choices=3D['DEBUG', 'RELEASE', '0'], dest=3D"TARGET", help=3D"TARGET is one of list: DEBUG, RELEASE, which replaces targ= et.txt's TARGET definition. To specify more TARGET, please repeat this opti= on. 0 will clear this setting in target.txt and can't combine with other va= lue.") parser.add_option("-n", "--tagname", action=3D"callback", type=3D"stri= ng", dest=3D"TOOL_CHAIN_TAG", callback=3DSingleCheckCallback, help=3D"Specify the Tool Chain Tagname, which replaces target.txt'= s TOOL_CHAIN_TAG definition. 0 will clear this setting in target.txt and ca= n't combine with other value.") diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python= /Trim/Trim.py index 1a690cde5933..d725e7ad2da0 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -262,7 +262,7 @@ def TrimPreprocessedVfr(Source, Target): CreateDirectory(os.path.dirname(Target)) =20 try: - f =3D open (Source,'r') + f =3D open (Source, 'r') except: EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=3DSource) # read whole file @@ -311,7 +311,7 @@ def TrimPreprocessedVfr(Source, Target): =20 # save all lines trimmed try: - f =3D open (Target,'w') + f =3D open (Target, 'w') except: EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=3DTarget) f.writelines(Lines) @@ -408,7 +408,7 @@ def TrimAslFile(Source, Target, IncludePathFile): if IncludePathFile: try: LineNum =3D 0 - for Line in open(IncludePathFile,'r'): + for Line in open(IncludePathFile, 'r'): LineNum +=3D 1 if Line.startswith("/I") or Line.startswith ("-I"): IncludePathList.append(Line[2:].strip()) @@ -426,7 +426,7 @@ def TrimAslFile(Source, Target, IncludePathFile): =20 # save all lines trimmed try: - f =3D open (Target,'w') + f =3D open (Target, 'w') except: EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=3DTarget) =20 @@ -561,7 +561,7 @@ def TrimEdkSourceCode(Source, Target): CreateDirectory(os.path.dirname(Target)) =20 try: - f =3D open (Source,'rb') + f =3D open (Source, 'rb') except: EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=3DSource) # read whole file @@ -569,7 +569,7 @@ def TrimEdkSourceCode(Source, Target): f.close() =20 NewLines =3D None - for Re,Repl in gImportCodePatterns: + for Re, Repl in gImportCodePatterns: if NewLines is None: NewLines =3D Re.sub(Repl, Lines) else: @@ -580,7 +580,7 @@ def TrimEdkSourceCode(Source, Target): return =20 try: - f =3D open (Target,'wb') + f =3D open (Target, 'wb') except: EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=3DTarget) f.write(NewLines) diff --git a/BaseTools/Source/Python/UPT/Core/DependencyRules.py b/BaseTool= s/Source/Python/UPT/Core/DependencyRules.py index 34f56e7bb487..406a8a7e92de 100644 --- a/BaseTools/Source/Python/UPT/Core/DependencyRules.py +++ b/BaseTools/Source/Python/UPT/Core/DependencyRules.py @@ -285,8 +285,8 @@ class DependencyRules(object): pass DecPath =3D dirname(DecFile) if DecPath.find(WorkSP) > -1: - InstallPath =3D GetRelativePath(DecPath,WorkSP) - DecFileRelaPath =3D GetRelativePath(DecFile,WorkSP) + InstallPath =3D GetRelativePath(DecPath, WorkSP) + DecFileRelaPath =3D GetRelativePath(DecFile, WorkSP) else: InstallPath =3D DecPath DecFileRelaPath =3D DecFile @@ -348,8 +348,8 @@ class DependencyRules(object): pass DecPath =3D dirname(DecFile) if DecPath.find(WorkSP) > -1: - InstallPath =3D GetRelativePath(DecPath,WorkSP) - DecFileRelaPath =3D GetRelativePath(DecFile,WorkSP) + InstallPath =3D GetRelativePath(DecPath, WorkSP) + DecFileRelaPath =3D GetRelativePath(DecFile, WorkSP) else: InstallPath =3D DecPath DecFileRelaPath =3D DecFile diff --git a/BaseTools/Source/Python/UPT/Core/IpiDb.py b/BaseTools/Source/P= ython/UPT/Core/IpiDb.py index 97ad47a58dbb..3bce33748198 100644 --- a/BaseTools/Source/Python/UPT/Core/IpiDb.py +++ b/BaseTools/Source/Python/UPT/Core/IpiDb.py @@ -459,7 +459,7 @@ class IpiDatabase(object): (select InstallPath from ModInPkgInfo where=20 ModInPkgInfo.PackageGuid =3D'%s'=20 and ModInPkgInfo.PackageVersion =3D '%s')""" \ - % (Pkg[0], Pkg[1], Pkg[0], Pkg[1], Pkg[0], Pkg= [1],Pkg[0], Pkg[1]) + % (Pkg[0], Pkg[1], Pkg[0], Pkg[1], Pkg[0], Pkg= [1], Pkg[0], Pkg[1]) =20 self.Cur.execute(SqlCommand) # @@ -921,7 +921,7 @@ class IpiDatabase(object): def __ConvertToSqlString(self, StringList): if self.DpTable: pass - return map(lambda s: s.replace("'", "''") , StringList) + return map(lambda s: s.replace("'", "''"), StringList) =20 =20 =20 diff --git a/BaseTools/Source/Python/UPT/Library/StringUtils.py b/BaseTools= /Source/Python/UPT/Library/StringUtils.py index dccaff744617..1003ffa673de 100644 --- a/BaseTools/Source/Python/UPT/Library/StringUtils.py +++ b/BaseTools/Source/Python/UPT/Library/StringUtils.py @@ -633,7 +633,7 @@ def SplitString(String): # @param StringList: A list for strings to be converted # def ConvertToSqlString(StringList): - return map(lambda s: s.replace("'", "''") , StringList) + return map(lambda s: s.replace("'", "''"), StringList) =20 ## Convert To Sql String # diff --git a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py b/Ba= seTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py index 4c28b7f5d22a..1e0c79d6677d 100644 --- a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py +++ b/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py @@ -649,7 +649,7 @@ class DecPomAlignment(PackageObject): ContainerFile, (Item.TokenSpaceGuidCName, Item.TokenCName, Item.DefaultValue, Item.DatumType, Item.TokenValue, - Type, Item.GetHeadComment(), Item.GetTailComment()= ,''), + Type, Item.GetHeadComment(), Item.GetTailComment()= , ''), Language, self.DecParser.GetDefineSectionMacro() ) diff --git a/BaseTools/Source/Python/UPT/UPT.py b/BaseTools/Source/Python/U= PT/UPT.py index 4b5ca5be008c..dedc241ee93d 100644 --- a/BaseTools/Source/Python/UPT/UPT.py +++ b/BaseTools/Source/Python/UPT/UPT.py @@ -315,7 +315,7 @@ def Main(): GlobalData.gDB.CloseDb() =20 if pf.system() =3D=3D 'Windows': - os.system('subst %s /D' % GlobalData.gWORKSPACE.replace('\\','= ')) + os.system('subst %s /D' % GlobalData.gWORKSPACE.replace('\\', = '')) =20 return ReturnCode =20 diff --git a/BaseTools/Source/Python/UPT/Xml/CommonXml.py b/BaseTools/Sourc= e/Python/UPT/Xml/CommonXml.py index 805310de4e46..8a8cce169626 100644 --- a/BaseTools/Source/Python/UPT/Xml/CommonXml.py +++ b/BaseTools/Source/Python/UPT/Xml/CommonXml.py @@ -355,7 +355,7 @@ class PackageHeaderXml(object): def FromXml(self, Item, Key, PackageObject2): if not Item: XmlTreeLevel =3D ['DistributionPackage', 'PackageSurfaceArea'] - CheckDict =3D {'PackageHeader':None, } + CheckDict =3D {'PackageHeader': None, } IsRequiredItemListNull(CheckDict, XmlTreeLevel) self.PackagePath =3D XmlElement(Item, '%s/PackagePath' % Key) self.Header.FromXml(Item, Key) diff --git a/BaseTools/Source/Python/UPT/Xml/XmlParser.py b/BaseTools/Sourc= e/Python/UPT/Xml/XmlParser.py index dccc7a88f1d9..877494574fca 100644 --- a/BaseTools/Source/Python/UPT/Xml/XmlParser.py +++ b/BaseTools/Source/Python/UPT/Xml/XmlParser.py @@ -104,7 +104,7 @@ class DistributionPackageXml(object): IsRequiredItemListNull(CheckDict, XmlTreeLevel) else: XmlTreeLevel =3D ['DistributionPackage', 'DistributionHead= er'] - CheckDict =3D CheckDict =3D {'DistributionHeader':'', } + CheckDict =3D CheckDict =3D {'DistributionHeader': '', } IsRequiredItemListNull(CheckDict, XmlTreeLevel) =20 # @@ -124,16 +124,16 @@ class DistributionPackageXml(object): # if self.DistP.Tools: XmlTreeLevel =3D ['DistributionPackage', 'Tools', 'Header'] - CheckDict =3D {'Name':self.DistP.Tools.GetName(), } + CheckDict =3D {'Name': self.DistP.Tools.GetName(), } IsRequiredItemListNull(CheckDict, XmlTreeLevel) =20 if not self.DistP.Tools.GetFileList(): XmlTreeLevel =3D ['DistributionPackage', 'Tools'] - CheckDict =3D {'FileName':None, } + CheckDict =3D {'FileName': None, } IsRequiredItemListNull(CheckDict, XmlTreeLevel) for Item in self.DistP.Tools.GetFileList(): XmlTreeLevel =3D ['DistributionPackage', 'Tools'] - CheckDict =3D {'FileName':Item.GetURI(), } + CheckDict =3D {'FileName': Item.GetURI(), } IsRequiredItemListNull(CheckDict, XmlTreeLevel) =20 # @@ -141,16 +141,16 @@ class DistributionPackageXml(object): # if self.DistP.MiscellaneousFiles: XmlTreeLevel =3D ['DistributionPackage', 'MiscellaneousFil= es', 'Header'] - CheckDict =3D {'Name':self.DistP.MiscellaneousFiles.GetNam= e(), } + CheckDict =3D {'Name': self.DistP.MiscellaneousFiles.GetNa= me(), } IsRequiredItemListNull(CheckDict, XmlTreeLevel) =20 if not self.DistP.MiscellaneousFiles.GetFileList(): XmlTreeLevel =3D ['DistributionPackage', 'Miscellaneou= sFiles'] - CheckDict =3D {'FileName':None, } + CheckDict =3D {'FileName': None, } IsRequiredItemListNull(CheckDict, XmlTreeLevel) for Item in self.DistP.MiscellaneousFiles.GetFileList(): XmlTreeLevel =3D ['DistributionPackage', 'Miscellaneou= sFiles'] - CheckDict =3D {'FileName':Item.GetURI(), } + CheckDict =3D {'FileName': Item.GetURI(), } IsRequiredItemListNull(CheckDict, XmlTreeLevel) =20 # @@ -158,7 +158,7 @@ class DistributionPackageXml(object): # for Item in self.DistP.UserExtensions: XmlTreeLevel =3D ['DistributionPackage', 'UserExtensions'] - CheckDict =3D {'UserId':Item.GetUserID(), } + CheckDict =3D {'UserId': Item.GetUserID(), } IsRequiredItemListNull(CheckDict, XmlTreeLevel) =20 =20 @@ -450,10 +450,10 @@ def ValidateMS1(Module, TopXmlTreeLevel): XmlTreeLevel =3D TopXmlTreeLevel + ['MiscellaneousFiles'] for Item in Module.GetMiscFileList(): if not Item.GetFileList(): - CheckDict =3D {'Filename':'', } + CheckDict =3D {'Filename': '', } IsRequiredItemListNull(CheckDict, XmlTreeLevel) for File in Item.GetFileList(): - CheckDict =3D {'Filename':File.GetURI(), } + CheckDict =3D {'Filename': File.GetURI(), } =20 ## ValidateMS2 # @@ -916,10 +916,10 @@ def ValidatePS2(Package): XmlTreeLevel =3D ['DistributionPackage', 'PackageSurfaceArea', 'Miscel= laneousFiles'] for Item in Package.GetMiscFileList(): if not Item.GetFileList(): - CheckDict =3D {'Filename':'', } + CheckDict =3D {'Filename': '', } IsRequiredItemListNull(CheckDict, XmlTreeLevel) for File in Item.GetFileList(): - CheckDict =3D {'Filename':File.GetURI(), } + CheckDict =3D {'Filename': File.GetURI(), } IsRequiredItemListNull(CheckDict, XmlTreeLevel) =20 ## ValidatePackageSurfaceArea diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTo= ols/Source/Python/Workspace/BuildClassObject.py index 209315d901b2..2569235fb875 100644 --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py @@ -70,23 +70,23 @@ class PcdClassObject(object): if IsDsc: self.DscDefaultValue =3D Value self.PcdValueFromComm =3D "" - self.DefinitionPosition =3D ("","") + self.DefinitionPosition =3D ("", "") =20 ## Get the maximum number of bytes def GetPcdMaxSize(self): if self.DatumType in TAB_PCD_NUMERIC_TYPES: return MAX_SIZE_TYPE[self.DatumType] =20 - MaxSize =3D int(self.MaxDatumSize,10) if self.MaxDatumSize else 0 + MaxSize =3D int(self.MaxDatumSize, 10) if self.MaxDatumSize else 0 if self.PcdValueFromComm: if self.PcdValueFromComm.startswith("{") and self.PcdValueFrom= Comm.endswith("}"): - return max([len(self.PcdValueFromComm.split(",")),MaxSize]) + return max([len(self.PcdValueFromComm.split(",")), MaxSize= ]) elif self.PcdValueFromComm.startswith("\"") or self.PcdValueFr= omComm.startswith("\'"): - return max([len(self.PcdValueFromComm)-2+1,MaxSize]) + return max([len(self.PcdValueFromComm)-2+1, MaxSize]) elif self.PcdValueFromComm.startswith("L\""): - return max([2*(len(self.PcdValueFromComm)-3+1),MaxSize]) + return max([2*(len(self.PcdValueFromComm)-3+1), MaxSize]) else: - return max([len(self.PcdValueFromComm),MaxSize]) + return max([len(self.PcdValueFromComm), MaxSize]) return MaxSize =20 ## Get the number of bytes @@ -178,7 +178,7 @@ class StructurePcd(PcdClassObject): self.DefaultValues[FieldName] =3D [Value.strip(), FileName, LineNo] return self.DefaultValues[FieldName] =20 - def SetDecDefaultValue(self,DefaultValue): + def SetDecDefaultValue(self, DefaultValue): self.DefaultValueFromDec =3D DefaultValue def AddOverrideValue (self, FieldName, Value, SkuName, DefaultStoreNam= e, FileName=3D"", LineNo=3D0): if SkuName not in self.SkuOverrideValues: diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py b/BaseTools/= Source/Python/Workspace/DecBuildData.py index 99257d08147b..7eeca9524529 100644 --- a/BaseTools/Source/Python/Workspace/DecBuildData.py +++ b/BaseTools/Source/Python/Workspace/DecBuildData.py @@ -369,16 +369,16 @@ class DecBuildData(PackageBuildClassObject): =20 def ProcessStructurePcd(self, StructurePcdRawDataSet): s_pcd_set =3D OrderedDict() - for s_pcd,LineNo in StructurePcdRawDataSet: + for s_pcd, LineNo in StructurePcdRawDataSet: if s_pcd.TokenSpaceGuidCName not in s_pcd_set: s_pcd_set[s_pcd.TokenSpaceGuidCName] =3D [] - s_pcd_set[s_pcd.TokenSpaceGuidCName].append((s_pcd,LineNo)) + s_pcd_set[s_pcd.TokenSpaceGuidCName].append((s_pcd, LineNo)) =20 str_pcd_set =3D [] for pcdname in s_pcd_set: dep_pkgs =3D [] struct_pcd =3D StructurePcd() - for item,LineNo in s_pcd_set[pcdname]: + for item, LineNo in s_pcd_set[pcdname]: if "" in item.TokenCName: struct_pcd.StructuredPcdIncludeFile.append(item.Defaul= tValue) elif "" in item.TokenCName: @@ -391,7 +391,7 @@ class DecBuildData(PackageBuildClassObject): struct_pcd.PkgPath =3D self.MetaFile.File struct_pcd.SetDecDefaultValue(item.DefaultValue) else: - struct_pcd.AddDefaultValue(item.TokenCName, item.Defau= ltValue,self.MetaFile.File,LineNo) + struct_pcd.AddDefaultValue(item.TokenCName, item.Defau= ltValue, self.MetaFile.File, LineNo) =20 struct_pcd.PackageDecs =3D dep_pkgs str_pcd_set.append(struct_pcd) @@ -412,7 +412,7 @@ class DecBuildData(PackageBuildClassObject): StrPcdSet =3D [] RecordList =3D self._RawData[Type, self._Arch] for TokenSpaceGuid, PcdCName, Setting, Arch, PrivateFlag, Dummy1, = Dummy2 in RecordList: - PcdDict[Arch, PcdCName, TokenSpaceGuid] =3D (Setting,Dummy2) + PcdDict[Arch, PcdCName, TokenSpaceGuid] =3D (Setting, Dummy2) if not (PcdCName, TokenSpaceGuid) in PcdSet: PcdSet.append((PcdCName, TokenSpaceGuid)) =20 @@ -421,7 +421,7 @@ class DecBuildData(PackageBuildClassObject): # limit the ARCH to self._Arch, if no self._Arch found, tdict # will automatically turn to 'common' ARCH and try again # - Setting,LineNo =3D PcdDict[self._Arch, PcdCName, TokenSpaceGui= d] + Setting, LineNo =3D PcdDict[self._Arch, PcdCName, TokenSpaceGu= id] if Setting is None: continue =20 @@ -442,9 +442,9 @@ class DecBuildData(PackageBuildClassObject): list(validlists), list(expressions) ) - PcdObj.DefinitionPosition =3D (self.MetaFile.File,LineNo) + PcdObj.DefinitionPosition =3D (self.MetaFile.File, LineNo) if "." in TokenSpaceGuid: - StrPcdSet.append((PcdObj,LineNo)) + StrPcdSet.append((PcdObj, LineNo)) else: Pcds[PcdCName, TokenSpaceGuid, self._PCD_TYPE_STRING_[Type= ]] =3D PcdObj =20 @@ -455,10 +455,10 @@ class DecBuildData(PackageBuildClassObject): for pcd in Pcds.values(): if pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TA= B_UINT64, TAB_VOID, "BOOLEAN"]: if StructPattern.match(pcd.DatumType) is None: - EdkLogger.error('build', FORMAT_INVALID, "DatumType on= ly support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct = name.", pcd.DefinitionPosition[0],pcd.DefinitionPosition[1]) + EdkLogger.error('build', FORMAT_INVALID, "DatumType on= ly support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct = name.", pcd.DefinitionPosition[0], pcd.DefinitionPosition[1]) for struct_pcd in Pcds.values(): - if isinstance(struct_pcd,StructurePcd) and not struct_pcd.Stru= cturedPcdIncludeFile: - EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, "The str= ucture Pcd %s.%s header file is not found in %s line %s \n" % (struct_pcd.T= okenSpaceGuidCName, struct_pcd.TokenCName,struct_pcd.DefinitionPosition[0],= struct_pcd.DefinitionPosition[1] )) + if isinstance(struct_pcd, StructurePcd) and not struct_pcd.Str= ucturedPcdIncludeFile: + EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, "The str= ucture Pcd %s.%s header file is not found in %s line %s \n" % (struct_pcd.T= okenSpaceGuidCName, struct_pcd.TokenCName, struct_pcd.DefinitionPosition[0]= , struct_pcd.DefinitionPosition[1] )) =20 return Pcds @property diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 462b06944a94..bbc5af34eb9e 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -41,7 +41,7 @@ import Common.GlobalData as GlobalData import subprocess from Common.Misc import SaveFileOnChange from Workspace.BuildClassObject import PlatformBuildClassObject, Structure= Pcd, PcdClassObject, ModuleBuildClassObject -from collections import OrderedDict,defaultdict +from collections import OrderedDict, defaultdict =20 PcdValueInitName =3D 'PcdValueInit' =20 @@ -109,7 +109,7 @@ from AutoGen.GenMake import gIncludePattern # # @retval list The list of files the given source file de= pends on # -def GetDependencyList(FileStack,SearchPathList): +def GetDependencyList(FileStack, SearchPathList): DepDb =3D dict() DependencySet =3D set(FileStack) while len(FileStack) > 0: @@ -225,7 +225,7 @@ class DscBuildData(PlatformBuildClassObject): @property def OutputPath(self): if os.getenv("WORKSPACE"): - return os.path.join(os.getenv("WORKSPACE"), self.OutputDirecto= ry, self._Target + "_" + self._Toolchain,PcdValueInitName) + return os.path.join(os.getenv("WORKSPACE"), self.OutputDirecto= ry, self._Target + "_" + self._Toolchain, PcdValueInitName) else: return os.path.dirname(self.DscFile) =20 @@ -658,7 +658,7 @@ class DscBuildData(PlatformBuildClassObject): =20 @staticmethod def ToInt(intstr): - return int(intstr,16) if intstr.upper().startswith("0X") else int(= intstr) + return int(intstr, 16) if intstr.upper().startswith("0X") else int= (intstr) =20 def _GetDefaultStores(self): if self.DefaultStores is None: @@ -677,9 +677,9 @@ class DscBuildData(PlatformBuildClassObject): if not IsValidWord(Record[1]): EdkLogger.error('build', FORMAT_INVALID, "The format o= f the DefaultStores ID name is invalid. The correct format is '(a-zA-Z0-9_)= (a-zA-Z0-9_-.)*'", File=3Dself.MetaFile, Line=3DRecord[-1= ]) - self.DefaultStores[Record[1].upper()] =3D (DscBuildData.To= Int(Record[0]),Record[1].upper()) + self.DefaultStores[Record[1].upper()] =3D (DscBuildData.To= Int(Record[0]), Record[1].upper()) if TAB_DEFAULT_STORES_DEFAULT not in self.DefaultStores: - self.DefaultStores[TAB_DEFAULT_STORES_DEFAULT] =3D (0,TAB_= DEFAULT_STORES_DEFAULT) + self.DefaultStores[TAB_DEFAULT_STORES_DEFAULT] =3D (0, TAB= _DEFAULT_STORES_DEFAULT) GlobalData.gDefaultStores =3D sorted(self.DefaultStores.keys()) return self.DefaultStores =20 @@ -737,7 +737,7 @@ class DscBuildData(PlatformBuildClassObject): for Type in [MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_= MODULE, \ MODEL_PCD_FEATURE_FLAG, MODEL_PCD_DYNAMIC, MODEL_= PCD_DYNAMIC_EX]: RecordList =3D self._RawData[Type, self._Arch, None, Modul= eId] - for TokenSpaceGuid, PcdCName, Setting, Dummy1, Dummy2, Dum= my3, Dummy4,Dummy5 in RecordList: + for TokenSpaceGuid, PcdCName, Setting, Dummy1, Dummy2, Dum= my3, Dummy4, Dummy5 in RecordList: TokenList =3D GetSplitValueList(Setting) DefaultValue =3D TokenList[0] # the format is PcdName| Value | VOID* | MaxDatumSize @@ -762,7 +762,7 @@ class DscBuildData(PlatformBuildClassObject): =20 # get module private build options RecordList =3D self._RawData[MODEL_META_DATA_BUILD_OPTION, sel= f._Arch, None, ModuleId] - for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3= , Dummy4,Dummy5 in RecordList: + for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3= , Dummy4, Dummy5 in RecordList: if (ToolChainFamily, ToolChain) not in Module.BuildOptions: Module.BuildOptions[ToolChainFamily, ToolChain] =3D Op= tion else: @@ -802,7 +802,7 @@ class DscBuildData(PlatformBuildClassObject): RecordList =3D self._RawData[MODEL_EFI_LIBRARY_CLASS, self._Ar= ch, None, -1] Macros =3D self._Macros for Record in RecordList: - LibraryClass, LibraryInstance, Dummy, Arch, ModuleType, Du= mmy,Dummy, LineNo =3D Record + LibraryClass, LibraryInstance, Dummy, Arch, ModuleType, Du= mmy, Dummy, LineNo =3D Record if LibraryClass =3D=3D '' or LibraryClass =3D=3D 'NULL': self._NullLibraryNumber +=3D 1 LibraryClass =3D 'NULL%d' % self._NullLibraryNumber @@ -869,7 +869,7 @@ class DscBuildData(PlatformBuildClassObject): ModuleData =3D self._Bdb[ModuleFile, self._Arch, self._Tar= get, self._Toolchain] PkgSet.update(ModuleData.Packages) =20 - self._DecPcds, self._GuidDict =3D GetDeclaredPcd(self, self._B= db, self._Arch, self._Target, self._Toolchain,PkgSet) + self._DecPcds, self._GuidDict =3D GetDeclaredPcd(self, self._B= db, self._Arch, self._Target, self._Toolchain, PkgSet) self._GuidDict.update(GlobalData.gPlatformPcds) =20 if (PcdCName, TokenSpaceGuid) not in self._DecPcds: @@ -914,14 +914,14 @@ class DscBuildData(PlatformBuildClassObject): ExtraData=3D"%s.%s" % (TokenSpaceGuid, Pcd= CName)) if PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX= _DEFAULT): if self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.strip= () !=3D ValueList[1].strip(): - EdkLogger.error('build', FORMAT_INVALID, "Pcd datumtyp= e used in DSC file is not the same as its declaration in DEC file." , File= =3Dself.MetaFile, Line=3DLineNo, + EdkLogger.error('build', FORMAT_INVALID, "Pcd datumtyp= e used in DSC file is not the same as its declaration in DEC file.", File= =3Dself.MetaFile, Line=3DLineNo, ExtraData=3D"%s.%s|%s" % (TokenSpaceGuid, = PcdCName, Setting)) if (TokenSpaceGuid + '.' + PcdCName) in GlobalData.gPlatformPcds: if GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] != =3D ValueList[Index]: GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] = =3D ValueList[Index] return ValueList =20 - def _FilterPcdBySkuUsage(self,Pcds): + def _FilterPcdBySkuUsage(self, Pcds): available_sku =3D self.SkuIdMgr.AvailableSkuIdSet sku_usage =3D self.SkuIdMgr.SkuUsageType if sku_usage =3D=3D SkuClass.SINGLE: @@ -937,7 +937,7 @@ class DscBuildData(PlatformBuildClassObject): if type(pcd) is StructurePcd and pcd.SkuOverrideValues: Pcds[pcdname].SkuOverrideValues =3D {skuid:pcd.SkuOver= rideValues[skuid] for skuid in pcd.SkuOverrideValues if skuid in available_= sku} return Pcds - def CompleteHiiPcdsDefaultStores(self,Pcds): + def CompleteHiiPcdsDefaultStores(self, Pcds): HiiPcd =3D [Pcds[pcd] for pcd in Pcds if Pcds[pcd].Type in [self._= PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_D= YNAMIC_EX_HII]]] DefaultStoreMgr =3D DefaultStore(self.DefaultStores) for pcd in HiiPcd: @@ -959,7 +959,7 @@ class DscBuildData(PlatformBuildClassObject): else: pcd.PcdValueFromComm =3D pcd.SkuInfoList.get(TAB_DEFAULT).= DefaultValue for pcd in self._Pcds: - if isinstance(self._Pcds[pcd],StructurePcd) and (self._Pcds[pc= d].PcdValueFromComm or self._Pcds[pcd].PcdFieldValueFromComm): + if isinstance(self._Pcds[pcd], StructurePcd) and (self._Pcds[p= cd].PcdValueFromComm or self._Pcds[pcd].PcdFieldValueFromComm): UpdateCommandLineValue(self._Pcds[pcd]) =20 def __ParsePcdFromCommandLine(self): @@ -971,10 +971,10 @@ class DscBuildData(PlatformBuildClassObject): if not pcdvalue: EdkLogger.error('build', AUTOGEN_ERROR, "No Value spec= ified for the PCD %s." % (pcdname)) if '.' in pcdname: - (Name1, Name2) =3D pcdname.split('.',1) + (Name1, Name2) =3D pcdname.split('.', 1) if "." in Name2: - (Name3, FieldName) =3D Name2.split(".",1) - if ((Name3,Name1)) in self.DecPcds: + (Name3, FieldName) =3D Name2.split(".", 1) + if ((Name3, Name1)) in self.DecPcds: HasTokenSpace =3D True TokenCName =3D Name3 TokenSpaceGuidCName =3D Name1 @@ -984,7 +984,7 @@ class DscBuildData(PlatformBuildClassObject): TokenSpaceGuidCName =3D '' HasTokenSpace =3D False else: - if ((Name2,Name1)) in self.DecPcds: + if ((Name2, Name1)) in self.DecPcds: HasTokenSpace =3D True TokenCName =3D Name2 TokenSpaceGuidCName =3D Name1 @@ -1038,7 +1038,7 @@ class DscBuildData(PlatformBuildClassObject): IsValid, Cause =3D CheckPcdDatum(PcdDatumType, pcdvalu= e) if not IsValid: EdkLogger.error("build", FORMAT_INVALID, Cause, Ex= traData=3D"%s.%s" % (TokenSpaceGuidCName, TokenCName)) - GlobalData.BuildOptionPcd[i] =3D (TokenSpaceGuidCName, Tok= enCName, FieldName, pcdvalue,("build command options",1)) + GlobalData.BuildOptionPcd[i] =3D (TokenSpaceGuidCName, Tok= enCName, FieldName, pcdvalue, ("build command options", 1)) =20 for BuildData in self._Bdb._CACHE_.values(): if BuildData.MetaFile.Ext =3D=3D '.dec' or BuildData.M= etaFile.Ext =3D=3D '.dsc': @@ -1149,7 +1149,7 @@ class DscBuildData(PlatformBuildClassObject): # for CodeBase in (EDKII_NAME, EDK_NAME): RecordList =3D self._RawData[MODEL_META_DATA_BUILD_OPTION,= self._Arch, CodeBase] - for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Du= mmy3, Dummy4,Dummy5 in RecordList: + for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Du= mmy3, Dummy4, Dummy5 in RecordList: if Dummy3.upper() !=3D TAB_COMMON: continue CurKey =3D (ToolChainFamily, ToolChain, CodeBase) @@ -1172,7 +1172,7 @@ class DscBuildData(PlatformBuildClassObject): DriverType =3D '%s.%s' % (Edk, ModuleType) CommonDriverType =3D '%s.%s' % (TAB_COMMON, ModuleType) RecordList =3D self._RawData[MODEL_META_DATA_BUILD_OPTION, sel= f._Arch] - for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3= , Dummy4,Dummy5 in RecordList: + for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3= , Dummy4, Dummy5 in RecordList: Type =3D Dummy2 + '.' + Dummy3 if Type.upper() =3D=3D DriverType.upper() or Type.upper() = =3D=3D CommonDriverType.upper(): Key =3D (ToolChainFamily, ToolChain, Edk) @@ -1187,7 +1187,7 @@ class DscBuildData(PlatformBuildClassObject): def GetStructurePcdInfo(PcdSet): structure_pcd_data =3D defaultdict(list) for item in PcdSet: - structure_pcd_data[(item[0],item[1])].append(item) + structure_pcd_data[(item[0], item[1])].append(item) =20 return structure_pcd_data =20 @@ -1195,25 +1195,25 @@ class DscBuildData(PlatformBuildClassObject): def OverrideByFdfComm(StruPcds): StructurePcdInCom =3D OrderedDict() for item in GlobalData.BuildOptionPcd: - if len(item) =3D=3D 5 and (item[1],item[0]) in StruPcds: - StructurePcdInCom[(item[0],item[1],item[2] )] =3D (item[3]= ,item[4]) - GlobalPcds =3D {(item[0],item[1]) for item in StructurePcdInCom} + if len(item) =3D=3D 5 and (item[1], item[0]) in StruPcds: + StructurePcdInCom[(item[0], item[1], item[2] )] =3D (item[= 3], item[4]) + GlobalPcds =3D {(item[0], item[1]) for item in StructurePcdInCom} for Pcd in StruPcds.values(): - if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) not in GlobalPcds: + if (Pcd.TokenSpaceGuidCName, Pcd.TokenCName) not in GlobalPcds: continue FieldValues =3D OrderedDict() for item in StructurePcdInCom: - if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) =3D=3D (item[0= ],item[1]) and item[2]: + if (Pcd.TokenSpaceGuidCName, Pcd.TokenCName) =3D=3D (item[= 0], item[1]) and item[2]: FieldValues[item[2]] =3D StructurePcdInCom[item] for field in FieldValues: if field not in Pcd.PcdFieldValueFromComm: - Pcd.PcdFieldValueFromComm[field] =3D ["","",""] + Pcd.PcdFieldValueFromComm[field] =3D ["", "", ""] Pcd.PcdFieldValueFromComm[field][0] =3D FieldValues[field]= [0] Pcd.PcdFieldValueFromComm[field][1] =3D FieldValues[field]= [1][0] Pcd.PcdFieldValueFromComm[field][2] =3D FieldValues[field]= [1][1] return StruPcds =20 - def OverrideByFdfCommOverAll(self,AllPcds): + def OverrideByFdfCommOverAll(self, AllPcds): def CheckStructureInComm(commpcds): if not commpcds: return False @@ -1222,43 +1222,43 @@ class DscBuildData(PlatformBuildClassObject): return False =20 if CheckStructureInComm(GlobalData.BuildOptionPcd): - StructurePcdInCom =3D {(item[0],item[1],item[2] ):(item[3],ite= m[4]) for item in GlobalData.BuildOptionPcd } if GlobalData.BuildOptionPcd = else {} - NoFiledValues =3D {(item[0],item[1]):StructurePcdInCom[item] f= or item in StructurePcdInCom if not item[2]} + StructurePcdInCom =3D {(item[0], item[1], item[2] ):(item[3], = item[4]) for item in GlobalData.BuildOptionPcd } if GlobalData.BuildOptionP= cd else {} + NoFiledValues =3D {(item[0], item[1]):StructurePcdInCom[item] = for item in StructurePcdInCom if not item[2]} else: - NoFiledValues =3D {(item[0],item[1]):[item[2]] for item in Glo= balData.BuildOptionPcd} - for Guid,Name in NoFiledValues: - if (Name,Guid) in AllPcds: - Pcd =3D AllPcds.get((Name,Guid)) - if isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenS= paceGuidCName), None),StructurePcd): - self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCN= ame)).PcdValueFromComm =3D NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.Token= CName)][0] + NoFiledValues =3D {(item[0], item[1]):[item[2]] for item in Gl= obalData.BuildOptionPcd} + for Guid, Name in NoFiledValues: + if (Name, Guid) in AllPcds: + Pcd =3D AllPcds.get((Name, Guid)) + if isinstance(self._DecPcds.get((Pcd.TokenCName, Pcd.Token= SpaceGuidCName), None), StructurePcd): + self._DecPcds.get((Pcd.TokenCName, Pcd.TokenSpaceGuidC= Name)).PcdValueFromComm =3D NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.Tok= enCName)][0] else: - Pcd.PcdValueFromComm =3D NoFiledValues[(Pcd.TokenSpace= GuidCName,Pcd.TokenCName)][0] - Pcd.DefaultValue =3D NoFiledValues[(Pcd.TokenSpaceGuid= CName,Pcd.TokenCName)][0] + Pcd.PcdValueFromComm =3D NoFiledValues[(Pcd.TokenSpace= GuidCName, Pcd.TokenCName)][0] + Pcd.DefaultValue =3D NoFiledValues[(Pcd.TokenSpaceGuid= CName, Pcd.TokenCName)][0] for sku in Pcd.SkuInfoList: SkuInfo =3D Pcd.SkuInfoList[sku] if SkuInfo.DefaultValue: - SkuInfo.DefaultValue =3D NoFiledValues[(Pcd.To= kenSpaceGuidCName,Pcd.TokenCName)][0] + SkuInfo.DefaultValue =3D NoFiledValues[(Pcd.To= kenSpaceGuidCName, Pcd.TokenCName)][0] else: - SkuInfo.HiiDefaultValue =3D NoFiledValues[(Pcd= .TokenSpaceGuidCName,Pcd.TokenCName)][0] + SkuInfo.HiiDefaultValue =3D NoFiledValues[(Pcd= .TokenSpaceGuidCName, Pcd.TokenCName)][0] for defaultstore in SkuInfo.DefaultStoreDict: - SkuInfo.DefaultStoreDict[defaultstore] =3D= NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.TokenCName)][0] + SkuInfo.DefaultStoreDict[defaultstore] =3D= NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0] if Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAM= IC_EX_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII]]: if Pcd.DatumType =3D=3D TAB_VOID: if not Pcd.MaxDatumSize: Pcd.MaxDatumSize =3D '0' - CurrentSize =3D int(Pcd.MaxDatumSize,16) if Pc= d.MaxDatumSize.upper().startswith("0X") else int(Pcd.MaxDatumSize) + CurrentSize =3D int(Pcd.MaxDatumSize, 16) if P= cd.MaxDatumSize.upper().startswith("0X") else int(Pcd.MaxDatumSize) OptionSize =3D len((StringToArray(Pcd.PcdValue= FromComm)).split(",")) MaxSize =3D max(CurrentSize, OptionSize) Pcd.MaxDatumSize =3D str(MaxSize) else: - PcdInDec =3D self.DecPcds.get((Name,Guid)) + PcdInDec =3D self.DecPcds.get((Name, Guid)) if PcdInDec: - PcdInDec.PcdValueFromComm =3D NoFiledValues[(Guid,Name= )][0] + PcdInDec.PcdValueFromComm =3D NoFiledValues[(Guid, Nam= e)][0] if PcdInDec.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_= FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_P= ATCHABLE_IN_MODULE], self._PCD_TYPE_STRING_[MODEL_PCD_F= EATURE_FLAG]]: self.Pcds[Name, Guid] =3D copy.deepcopy(PcdInDec) - self.Pcds[Name, Guid].DefaultValue =3D NoFiledValu= es[( Guid,Name)][0] + self.Pcds[Name, Guid].DefaultValue =3D NoFiledValu= es[( Guid, Name)][0] return AllPcds def UpdateStructuredPcds(self, TypeList, AllPcds): =20 @@ -1282,7 +1282,7 @@ class DscBuildData(PlatformBuildClassObject): for Type in TypeList: RecordList.extend(self._RawData[Type, self._Arch]) =20 - for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, default_stor= e, Dummy4,Dummy5 in RecordList: + for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, default_stor= e, Dummy4, Dummy5 in RecordList: SkuName =3D SkuName.upper() default_store =3D default_store.upper() SkuName =3D TAB_DEFAULT if SkuName =3D=3D TAB_COMMON else SkuN= ame @@ -1290,7 +1290,7 @@ class DscBuildData(PlatformBuildClassObject): continue =20 if SkuName in SkuIds and "." in TokenSpaceGuid: - S_PcdSet.append([ TokenSpaceGuid.split(".")[0],TokenSpaceG= uid.split(".")[1], PcdCName,SkuName, default_store,Dummy5, AnalyzePcdExpres= sion(Setting)[0]]) + S_PcdSet.append([ TokenSpaceGuid.split(".")[0], TokenSpace= Guid.split(".")[1], PcdCName, SkuName, default_store, Dummy5, AnalyzePcdExp= ression(Setting)[0]]) =20 # handle pcd value override StrPcdSet =3D DscBuildData.GetStructurePcdInfo(S_PcdSet) @@ -1301,7 +1301,7 @@ class DscBuildData(PlatformBuildClassObject): if not isinstance (str_pcd_dec, StructurePcd): EdkLogger.error('build', PARSER_ERROR, "Pcd (%s.%s) is not declared as Structure PCD = in DEC files. Arch: ['%s']" % (str_pcd[0], str_pcd[1], self._Arch), - File=3Dself.MetaFile,Line =3D StrPcdSet[str_pc= d][0][5]) + File=3Dself.MetaFile, Line =3D StrPcdSet[str_p= cd][0][5]) if str_pcd_dec: str_pcd_obj_str =3D StructurePcd() str_pcd_obj_str.copy(str_pcd_dec) @@ -1313,12 +1313,12 @@ class DscBuildData(PlatformBuildClassObject): str_pcd_obj_str.DefaultFromDSC =3D {skuname:{defau= ltstore: str_pcd_obj.SkuInfoList[skuname].DefaultStoreDict.get(defaultstore= , str_pcd_obj.SkuInfoList[skuname].DefaultValue) for defaultstore in Defaul= tStores} for skuname in str_pcd_obj.SkuInfoList} for str_pcd_data in StrPcdSet[str_pcd]: if str_pcd_data[3] in SkuIds: - str_pcd_obj_str.AddOverrideValue(str_pcd_data[2], = str(str_pcd_data[6]), TAB_DEFAULT if str_pcd_data[3] =3D=3D TAB_COMMON else= str_pcd_data[3],TAB_DEFAULT_STORES_DEFAULT if str_pcd_data[4] =3D=3D TAB_C= OMMON else str_pcd_data[4], self.MetaFile.File if self.WorkspaceDir not in = self.MetaFile.File else self.MetaFile.File[len(self.WorkspaceDir) if self.W= orkspaceDir.endswith(os.path.sep) else len(self.WorkspaceDir)+1:],LineNo=3D= str_pcd_data[5]) + str_pcd_obj_str.AddOverrideValue(str_pcd_data[2], = str(str_pcd_data[6]), TAB_DEFAULT if str_pcd_data[3] =3D=3D TAB_COMMON else= str_pcd_data[3], TAB_DEFAULT_STORES_DEFAULT if str_pcd_data[4] =3D=3D TAB_= COMMON else str_pcd_data[4], self.MetaFile.File if self.WorkspaceDir not in= self.MetaFile.File else self.MetaFile.File[len(self.WorkspaceDir) if self.= WorkspaceDir.endswith(os.path.sep) else len(self.WorkspaceDir)+1:], LineNo= =3Dstr_pcd_data[5]) S_pcd_set[str_pcd[1], str_pcd[0]] =3D str_pcd_obj_str else: EdkLogger.error('build', PARSER_ERROR, "Pcd (%s.%s) defined in DSC is not declared in= DEC files. Arch: ['%s']" % (str_pcd[0], str_pcd[1], self._Arch), - File=3Dself.MetaFile,Line =3D StrPcdSet[str_pc= d][0][5]) + File=3Dself.MetaFile, Line =3D StrPcdSet[str_p= cd][0][5]) # Add the Structure PCD that only defined in DEC, don't have overr= ide in DSC file for Pcd in self.DecPcds: if type (self._DecPcds[Pcd]) is StructurePcd: @@ -1349,7 +1349,7 @@ class DscBuildData(PlatformBuildClassObject): nextskuid =3D self.SkuIdMgr.GetNextSkuId(nextskuid) stru_pcd.SkuOverrideValues[skuid] =3D copy.deepcopy(st= ru_pcd.SkuOverrideValues[nextskuid]) if not NoDefault else copy.deepcopy({d= efaultstorename: stru_pcd.DefaultValues for defaultstorename in DefaultStor= es} if DefaultStores else {TAB_DEFAULT_STORES_DEFAULT:stru_pcd.DefaultValue= s}) if not NoDefault: - stru_pcd.ValueChain.add((skuid,'')) + stru_pcd.ValueChain.add((skuid, '')) if stru_pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_= HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]: for skuid in SkuIds: nextskuid =3D skuid @@ -1368,11 +1368,11 @@ class DscBuildData(PlatformBuildClassObject): for defaultstoreid in DefaultStores: if defaultstoreid not in stru_pcd.SkuOverrideValue= s[skuid]: stru_pcd.SkuOverrideValues[skuid][defaultstore= id] =3D copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstore= name]) - stru_pcd.ValueChain.add((skuid,defaultstoreid)) + stru_pcd.ValueChain.add((skuid, defaultstoreid= )) S_pcd_set =3D DscBuildData.OverrideByFdfComm(S_pcd_set) Str_Pcd_Values =3D self.GenerateByteArrayValue(S_pcd_set) if Str_Pcd_Values: - for (skuname,StoreName,PcdGuid,PcdName,PcdValue) in Str_Pcd_Va= lues: + for (skuname, StoreName, PcdGuid, PcdName, PcdValue) in Str_Pc= d_Values: str_pcd_obj =3D S_pcd_set.get((PcdName, PcdGuid)) if str_pcd_obj is None: print(PcdName, PcdGuid) @@ -1424,7 +1424,7 @@ class DscBuildData(PlatformBuildClassObject): elif TAB_DEFAULT in pcd.SkuInfoList and TAB_COMMON in pcd.= SkuInfoList: del pcd.SkuInfoList[TAB_COMMON] =20 - map(self.FilterSkuSettings,[Pcds[pcdkey] for pcdkey in Pcds if Pcd= s[pcdkey].Type in DynamicPcdType]) + map(self.FilterSkuSettings, [Pcds[pcdkey] for pcdkey in Pcds if Pc= ds[pcdkey].Type in DynamicPcdType]) return Pcds =20 ## Retrieve non-dynamic PCD settings @@ -1446,7 +1446,7 @@ class DscBuildData(PlatformBuildClassObject): # Find out all possible PCD candidates for self._Arch RecordList =3D self._RawData[Type, self._Arch] PcdValueDict =3D OrderedDict() - for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dumm= y4,Dummy5 in RecordList: + for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dumm= y4, Dummy5 in RecordList: SkuName =3D SkuName.upper() SkuName =3D TAB_DEFAULT if SkuName =3D=3D TAB_COMMON else SkuN= ame if SkuName not in AvailableSkuIdSet: @@ -1467,7 +1467,7 @@ class DscBuildData(PlatformBuildClassObject): else: PcdValueDict[PcdCName, TokenSpaceGuid] =3D {SkuName:(PcdVa= lue, DatumType, MaxDatumSize)} =20 - for ((PcdCName,TokenSpaceGuid),PcdSetting) in PcdValueDict.iterite= ms(): + for ((PcdCName, TokenSpaceGuid), PcdSetting) in PcdValueDict.iteri= tems(): PcdValue =3D None DatumType =3D None MaxDatumSize =3D None @@ -1537,7 +1537,7 @@ class DscBuildData(PlatformBuildClassObject): Result =3D Result + '"' return Result =20 - def GenerateSizeFunction(self,Pcd): + def GenerateSizeFunction(self, Pcd): CApp =3D "// Default Value in Dec \n" CApp =3D CApp + "void Cal_%s_%s_Size(UINT32 *Size){\n" % (Pcd.Toke= nSpaceGuidCName, Pcd.TokenCName) for FieldList in [Pcd.DefaultValues]: @@ -1619,7 +1619,7 @@ class DscBuildData(PlatformBuildClassObject): while '[' in FieldName: FieldName =3D FieldName.rsplit('[', 1)[0] CApp =3D CApp + ' __FLEXIBLE_SIZE(*Size, %s, %s, %d);= // From %s Line %d Value %s \n' % (Pcd.DatumType, FieldName.strip("."), Ar= rayIndex + 1, Pcd.PcdFieldValueFromComm[FieldName_ori][1], Pcd.PcdFieldValu= eFromComm[FieldName_ori][2], Pcd.PcdFieldValueFromComm[FieldName_ori][0]) - CApp =3D CApp + " *Size =3D (%d > *Size ? %d : *Size); // The Pcd= maxsize is %d \n" % (Pcd.GetPcdMaxSize(),Pcd.GetPcdMaxSize(),Pcd.GetPcdMax= Size()) + CApp =3D CApp + " *Size =3D (%d > *Size ? %d : *Size); // The Pcd= maxsize is %d \n" % (Pcd.GetPcdMaxSize(), Pcd.GetPcdMaxSize(), Pcd.GetPcdM= axSize()) CApp =3D CApp + "}\n" return CApp =20 @@ -1629,9 +1629,9 @@ class DscBuildData(PlatformBuildClassObject): CApp =3D CApp + ' Cal_%s_%s_Size(&Size);\n' % (Pcd.TokenSpaceGuid= CName, Pcd.TokenCName) return CApp =20 - def GenerateDefaultValueAssignFunction(self,Pcd): + def GenerateDefaultValueAssignFunction(self, Pcd): CApp =3D "// Default value in Dec \n" - CApp =3D CApp + "void Assign_%s_%s_Default_Value(%s *Pcd){\n" % (P= cd.TokenSpaceGuidCName, Pcd.TokenCName,Pcd.DatumType) + CApp =3D CApp + "void Assign_%s_%s_Default_Value(%s *Pcd){\n" % (P= cd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType) CApp =3D CApp + ' UINT32 FieldSize;\n' CApp =3D CApp + ' CHAR8 *Value;\n' DefaultValueFromDec =3D Pcd.DefaultValueFromDec @@ -1662,12 +1662,12 @@ class DscBuildData(PlatformBuildClassObject): FieldList[FieldName][0] =3D ValueExpressionEx(Fiel= dList[FieldName][0], TAB_VOID, self._GuidDict)(True) except BadExpression: EdkLogger.error('Build', FORMAT_INVALID, "Invalid = value format for %s. From %s Line %d " % - (".".join((Pcd.TokenSpaceGuidCName= , Pcd.TokenCName, FieldName)), FieldList[FieldName][1],FieldList[FieldName]= [2])) + (".".join((Pcd.TokenSpaceGuidCName= , Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName= ][2])) =20 try: Value, ValueSize =3D ParseFieldValue (FieldList[FieldN= ame][0]) except Exception: - EdkLogger.error('Build', FORMAT_INVALID, "Invalid valu= e format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName,Pcd= .TokenCName,FieldName)),FieldList[FieldName][1], FieldList[FieldName][2])) + EdkLogger.error('Build', FORMAT_INVALID, "Invalid valu= e format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName, Pc= d.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]= )) if isinstance(Value, str): CApp =3D CApp + ' Pcd->%s =3D %s; // From %s Line %d = Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldNa= me][2], FieldList[FieldName][0]) elif IsArray: @@ -1690,22 +1690,22 @@ class DscBuildData(PlatformBuildClassObject): CApp =3D ' Assign_%s_%s_Default_Value(Pcd);\n' % (Pcd.TokenSpaceG= uidCName, Pcd.TokenCName) return CApp =20 - def GenerateInitValueFunction(self,Pcd,SkuName,DefaultStoreName): - CApp =3D "// Value in Dsc for Sku: %s, DefaultStore %s\n" % (SkuNa= me,DefaultStoreName) - CApp =3D CApp + "void Assign_%s_%s_%s_%s_Value(%s *Pcd){\n" % (Pcd= .TokenSpaceGuidCName, Pcd.TokenCName,SkuName,DefaultStoreName,Pcd.DatumType) + def GenerateInitValueFunction(self, Pcd, SkuName, DefaultStoreName): + CApp =3D "// Value in Dsc for Sku: %s, DefaultStore %s\n" % (SkuNa= me, DefaultStoreName) + CApp =3D CApp + "void Assign_%s_%s_%s_%s_Value(%s *Pcd){\n" % (Pcd= .TokenSpaceGuidCName, Pcd.TokenCName, SkuName, DefaultStoreName, Pcd.DatumT= ype) CApp =3D CApp + ' UINT32 FieldSize;\n' CApp =3D CApp + ' CHAR8 *Value;\n' =20 CApp =3D CApp + "// SkuName: %s, DefaultStoreName: %s \n" % (TAB_= DEFAULT, TAB_DEFAULT_STORES_DEFAULT) inherit_OverrideValues =3D Pcd.SkuOverrideValues[SkuName] - if (SkuName,DefaultStoreName) =3D=3D (TAB_DEFAULT,TAB_DEFAULT_STOR= ES_DEFAULT): - pcddefaultvalue =3D Pcd.DefaultFromDSC.get(TAB_DEFAULT,{}).get= (TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else P= cd.DefaultValue + if (SkuName, DefaultStoreName) =3D=3D (TAB_DEFAULT, TAB_DEFAULT_ST= ORES_DEFAULT): + pcddefaultvalue =3D Pcd.DefaultFromDSC.get(TAB_DEFAULT, {}).ge= t(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else = Pcd.DefaultValue else: if not Pcd.DscRawValue: # handle the case that structure pcd is not appear in DSC self.CopyDscRawValue(Pcd) - pcddefaultvalue =3D Pcd.DscRawValue.get(SkuName,{}).get(Defaul= tStoreName) - for FieldList in [pcddefaultvalue,inherit_OverrideValues.get(Defau= ltStoreName)]: + pcddefaultvalue =3D Pcd.DscRawValue.get(SkuName, {}).get(Defau= ltStoreName) + for FieldList in [pcddefaultvalue, inherit_OverrideValues.get(Defa= ultStoreName)]: if not FieldList: continue if pcddefaultvalue and FieldList =3D=3D pcddefaultvalue: @@ -1718,26 +1718,26 @@ class DscBuildData(PlatformBuildClassObject): (Pcd.TokenSpaceGuidCName, Pcd.Toke= nCName, FieldList)) Value, ValueSize =3D ParseFieldValue (FieldList) =20 - if (SkuName,DefaultStoreName) =3D=3D (TAB_DEFAULT,TAB_DEFA= ULT_STORES_DEFAULT): + if (SkuName, DefaultStoreName) =3D=3D (TAB_DEFAULT, TAB_DE= FAULT_STORES_DEFAULT): if isinstance(Value, str): - CApp =3D CApp + ' Pcd =3D %s; // From DSC Default= Value %s\n' % (Value, Pcd.DefaultFromDSC.get(TAB_DEFAULT,{}).get(TAB_DEFAU= LT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.Default= Value) + CApp =3D CApp + ' Pcd =3D %s; // From DSC Default= Value %s\n' % (Value, Pcd.DefaultFromDSC.get(TAB_DEFAULT, {}).get(TAB_DEFA= ULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.Defaul= tValue) elif IsArray: # # Use memcpy() to copy value into field # - CApp =3D CApp + ' Value =3D %s; // From DSC D= efault Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.Defa= ultFromDSC.get(TAB_DEFAULT,{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultV= alue) if Pcd.DefaultFromDSC else Pcd.DefaultValue) + CApp =3D CApp + ' Value =3D %s; // From DSC D= efault Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.Defa= ultFromDSC.get(TAB_DEFAULT, {}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.Default= Value) if Pcd.DefaultFromDSC else Pcd.DefaultValue) CApp =3D CApp + ' memcpy (Pcd, Value, %d);\n' % (= ValueSize) else: if isinstance(Value, str): - CApp =3D CApp + ' Pcd =3D %s; // From DSC Default= Value %s\n' % (Value, Pcd.DscRawValue.get(SkuName,{}).get(DefaultStoreName= )) + CApp =3D CApp + ' Pcd =3D %s; // From DSC Default= Value %s\n' % (Value, Pcd.DscRawValue.get(SkuName, {}).get(DefaultStoreNam= e)) elif IsArray: # # Use memcpy() to copy value into field # - CApp =3D CApp + ' Value =3D %s; // From DSC D= efault Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DscR= awValue.get(SkuName,{}).get(DefaultStoreName)) + CApp =3D CApp + ' Value =3D %s; // From DSC D= efault Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DscR= awValue.get(SkuName, {}).get(DefaultStoreName)) CApp =3D CApp + ' memcpy (Pcd, Value, %d);\n' % (= ValueSize) continue - if (SkuName,DefaultStoreName) =3D=3D (TAB_DEFAULT,TAB_DEFAULT_= STORES_DEFAULT) or (( (SkuName,'') not in Pcd.ValueChain) and ( (SkuName,De= faultStoreName) not in Pcd.ValueChain )): + if (SkuName, DefaultStoreName) =3D=3D (TAB_DEFAULT, TAB_DEFAUL= T_STORES_DEFAULT) or (( (SkuName, '') not in Pcd.ValueChain) and ( (SkuName= , DefaultStoreName) not in Pcd.ValueChain )): for FieldName in FieldList: IsArray =3D IsFieldValueAnArray(FieldList[FieldName][0= ]) if IsArray: @@ -1749,7 +1749,7 @@ class DscBuildData(PlatformBuildClassObject): try: Value, ValueSize =3D ParseFieldValue (FieldList[Fi= eldName][0]) except Exception: - EdkLogger.error('Build', FORMAT_INVALID, "Invalid = value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName= ,Pcd.TokenCName,FieldName)),FieldList[FieldName][1], FieldList[FieldName][2= ])) + EdkLogger.error('Build', FORMAT_INVALID, "Invalid = value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName= , Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName= ][2])) if isinstance(Value, str): CApp =3D CApp + ' Pcd->%s =3D %s; // From %s Line= %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[Fie= ldName][2], FieldList[FieldName][0]) elif IsArray: @@ -1768,18 +1768,18 @@ class DscBuildData(PlatformBuildClassObject): return CApp =20 @staticmethod - def GenerateInitValueStatement(Pcd,SkuName,DefaultStoreName): - CApp =3D ' Assign_%s_%s_%s_%s_Value(Pcd);\n' % (Pcd.TokenSpaceGui= dCName, Pcd.TokenCName,SkuName,DefaultStoreName) + def GenerateInitValueStatement(Pcd, SkuName, DefaultStoreName): + CApp =3D ' Assign_%s_%s_%s_%s_Value(Pcd);\n' % (Pcd.TokenSpaceGui= dCName, Pcd.TokenCName, SkuName, DefaultStoreName) return CApp =20 - def GenerateCommandLineValue(self,Pcd): + def GenerateCommandLineValue(self, Pcd): CApp =3D "// Value in CommandLine\n" - CApp =3D CApp + "void Assign_%s_%s_CommandLine_Value(%s *Pcd){\n" = % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,Pcd.DatumType) + CApp =3D CApp + "void Assign_%s_%s_CommandLine_Value(%s *Pcd){\n" = % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType) CApp =3D CApp + ' UINT32 FieldSize;\n' CApp =3D CApp + ' CHAR8 *Value;\n' =20 pcddefaultvalue =3D Pcd.PcdValueFromComm - for FieldList in [pcddefaultvalue,Pcd.PcdFieldValueFromComm]: + for FieldList in [pcddefaultvalue, Pcd.PcdFieldValueFromComm]: if not FieldList: continue if pcddefaultvalue and FieldList =3D=3D pcddefaultvalue: @@ -1814,7 +1814,7 @@ class DscBuildData(PlatformBuildClassObject): try: Value, ValueSize =3D ParseFieldValue (FieldList[FieldN= ame][0]) except Exception: - EdkLogger.error('Build', FORMAT_INVALID, "Invalid valu= e format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName,Pcd= .TokenCName,FieldName)),FieldList[FieldName][1], FieldList[FieldName][2])) + EdkLogger.error('Build', FORMAT_INVALID, "Invalid valu= e format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName, Pc= d.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]= )) if isinstance(Value, str): CApp =3D CApp + ' Pcd->%s =3D %s; // From %s Line %d = Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldNa= me][2], FieldList[FieldName][0]) elif IsArray: @@ -1856,7 +1856,7 @@ class DscBuildData(PlatformBuildClassObject): CApp =3D CApp + '\n' =20 if SkuName in Pcd.SkuInfoList: - DefaultValue =3D Pcd.SkuInfoList[SkuName].DefaultStoreDict= .get(DefaultStoreName,Pcd.SkuInfoList[SkuName].HiiDefaultValue if Pcd.SkuIn= foList[SkuName].HiiDefaultValue else Pcd.SkuInfoList[SkuName].DefaultValue) + DefaultValue =3D Pcd.SkuInfoList[SkuName].DefaultStoreDict= .get(DefaultStoreName, Pcd.SkuInfoList[SkuName].HiiDefaultValue if Pcd.SkuI= nfoList[SkuName].HiiDefaultValue else Pcd.SkuInfoList[SkuName].DefaultValu= e) else: DefaultValue =3D Pcd.DefaultValue PcdDefaultValue =3D StringToArray(DefaultValue.strip()) @@ -1902,12 +1902,12 @@ class DscBuildData(PlatformBuildClassObject): storeset =3D [DefaultStoreName] if DefaultStoreName = =3D=3D TAB_DEFAULT_STORES_DEFAULT else [TAB_DEFAULT_STORES_DEFAULT, Default= StoreName] for defaultstorenameitem in storeset: CApp =3D CApp + "// SkuName: %s, DefaultStoreName= : %s \n" % (skuname, defaultstorenameitem) - CApp =3D CApp + DscBuildData.GenerateInitValueStat= ement(Pcd,skuname,defaultstorenameitem) + CApp =3D CApp + DscBuildData.GenerateInitValueStat= ement(Pcd, skuname, defaultstorenameitem) if skuname =3D=3D SkuName: break else: CApp =3D CApp + "// SkuName: %s, DefaultStoreName: STANDA= RD \n" % self.SkuIdMgr.SystemSkuId - CApp =3D CApp + DscBuildData.GenerateInitValueStatement(Pc= d,self.SkuIdMgr.SystemSkuId,TAB_DEFAULT_STORES_DEFAULT) + CApp =3D CApp + DscBuildData.GenerateInitValueStatement(Pc= d, self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT) CApp =3D CApp + DscBuildData.GenerateCommandLineValueStatement= (Pcd) # # Set new PCD value and size @@ -1947,13 +1947,13 @@ class DscBuildData(PlatformBuildClassObject): CApp =3D CApp + self.GenerateCommandLineValue(Pcd) if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_ST= RING_[MODEL_PCD_FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODU= LE]]: - CApp =3D CApp + self.GenerateInitValueFunction(Pcd,self.Sk= uIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT) + CApp =3D CApp + self.GenerateInitValueFunction(Pcd, self.S= kuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT) else: for SkuName in self.SkuIdMgr.SkuOverrideOrder(): if SkuName not in Pcd.SkuOverrideValues: continue for DefaultStoreName in Pcd.SkuOverrideValues[SkuName]: - CApp =3D CApp + self.GenerateInitValueFunction(Pcd= ,SkuName,DefaultStoreName) + CApp =3D CApp + self.GenerateInitValueFunction(Pcd= , SkuName, DefaultStoreName) if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_ST= RING_[MODEL_PCD_FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODU= LE]]: InitByteValue, CApp =3D self.GenerateInitializeFunc(self.S= kuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT, Pcd, InitByteValue, CApp) @@ -1971,7 +1971,7 @@ class DscBuildData(PlatformBuildClassObject): CApp =3D CApp + ' )\n' CApp =3D CApp + '{\n' for Pcd in StructuredPcds.values(): - if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_ST= RING_[MODEL_PCD_FIXED_AT_BUILD],self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_= IN_MODULE]]: + if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_ST= RING_[MODEL_PCD_FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE= _IN_MODULE]]: CApp =3D CApp + ' Initialize_%s_%s_%s_%s();\n' % (self.Sk= uIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT, Pcd.TokenSpaceGuidCName, Pc= d.TokenCName) else: for SkuName in self.SkuIdMgr.SkuOverrideOrder(): @@ -2073,7 +2073,7 @@ class DscBuildData(PlatformBuildClassObject): IncludeFileFullPaths =3D [] for includefile in IncludeFiles: for includepath in IncSearchList: - includefullpath =3D os.path.join(str(includepath),includef= ile) + includefullpath =3D os.path.join(str(includepath), include= file) if os.path.exists(includefullpath): IncludeFileFullPaths.append(os.path.normpath(includefu= llpath)) break @@ -2081,7 +2081,7 @@ class DscBuildData(PlatformBuildClassObject): SearchPathList.append(os.path.normpath(mws.join(GlobalData.gWorksp= ace, "BaseTools/Source/C/Include"))) SearchPathList.append(os.path.normpath(mws.join(GlobalData.gWorksp= ace, "BaseTools/Source/C/Common"))) SearchPathList.extend(str(item) for item in IncSearchList) - IncFileList =3D GetDependencyList(IncludeFileFullPaths,SearchPathL= ist) + IncFileList =3D GetDependencyList(IncludeFileFullPaths, SearchPath= List) for include_file in IncFileList: MakeApp +=3D "$(OBJECTS) : %s\n" % include_file MakeFileName =3D os.path.join(self.OutputPath, 'Makefile') @@ -2127,7 +2127,7 @@ class DscBuildData(PlatformBuildClassObject): if FileLine.isdigit(): error_line =3D FileData[int (FileLine) - 1] if r"//" in error_line: - c_line,dsc_line =3D error_line.split(r"//") + c_line, dsc_line =3D error_line.split(r"//") else: dsc_line =3D error_line message_itmes =3D Message.split(":") @@ -2151,7 +2151,7 @@ class DscBuildData(PlatformBuildClassObject): else: EdkLogger.error('Build', COMMAND_FAILURE, 'Can not execute= command: %s' % MakeCommand) =20 - if DscBuildData.NeedUpdateOutput(OutputValueFile, PcdValueInitExe = ,InputValueFile): + if DscBuildData.NeedUpdateOutput(OutputValueFile, PcdValueInitExe,= InputValueFile): Command =3D PcdValueInitExe + ' -i %s -o %s' % (InputValueFile= , OutputValueFile) returncode, StdOut, StdErr =3D DscBuildData.ExecuteCommand (Co= mmand) if returncode !=3D 0: @@ -2165,7 +2165,7 @@ class DscBuildData(PlatformBuildClassObject): for Pcd in FileBuffer: PcdValue =3D Pcd.split ('|') PcdInfo =3D PcdValue[0].split ('.') - StructurePcdSet.append((PcdInfo[0],PcdInfo[1], PcdInfo[2], Pcd= Info[3], PcdValue[2].strip())) + StructurePcdSet.append((PcdInfo[0], PcdInfo[1], PcdInfo[2], Pc= dInfo[3], PcdValue[2].strip())) return StructurePcdSet =20 @staticmethod @@ -2199,7 +2199,7 @@ class DscBuildData(PlatformBuildClassObject): AvailableSkuIdSet =3D copy.copy(self.SkuIds) =20 =20 - for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dumm= y4,Dummy5 in RecordList: + for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dumm= y4, Dummy5 in RecordList: SkuName =3D SkuName.upper() SkuName =3D TAB_DEFAULT if SkuName =3D=3D TAB_COMMON else SkuN= ame if SkuName not in AvailableSkuIdSet: @@ -2261,7 +2261,7 @@ class DscBuildData(PlatformBuildClassObject): elif TAB_DEFAULT in pcd.SkuInfoList and TAB_COMMON in pcd.SkuI= nfoList: del pcd.SkuInfoList[TAB_COMMON] =20 - map(self.FilterSkuSettings,Pcds.values()) + map(self.FilterSkuSettings, Pcds.values()) =20 return Pcds =20 @@ -2292,7 +2292,7 @@ class DscBuildData(PlatformBuildClassObject): else: return False =20 - def CopyDscRawValue(self,Pcd): + def CopyDscRawValue(self, Pcd): if Pcd.DscRawValue is None: Pcd.DscRawValue =3D dict() if Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD], = self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]: @@ -2306,10 +2306,10 @@ class DscBuildData(PlatformBuildClassObject): Pcd.DscRawValue[skuname][defaultstore] =3D Pcd.SkuInfo= List[skuname].DefaultStoreDict[defaultstore] else: Pcd.DscRawValue[skuname][TAB_DEFAULT_STORES_DEFAULT] =3D P= cd.SkuInfoList[skuname].DefaultValue - def CompletePcdValues(self,PcdSet): + def CompletePcdValues(self, PcdSet): Pcds =3D {} DefaultStoreObj =3D DefaultStore(self._GetDefaultStores()) - SkuIds =3D {skuname:skuid for skuname,skuid in self.SkuIdMgr.Avail= ableSkuIdSet.items() if skuname !=3D TAB_COMMON} + SkuIds =3D {skuname:skuid for skuname, skuid in self.SkuIdMgr.Avai= lableSkuIdSet.items() if skuname !=3D TAB_COMMON} DefaultStores =3D set(storename for pcdobj in PcdSet.values() for = skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreD= ict) for PcdCName, TokenSpaceGuid in PcdSet: PcdObj =3D PcdSet[(PcdCName, TokenSpaceGuid)] @@ -2331,7 +2331,7 @@ class DscBuildData(PlatformBuildClassObject): if defaultstorename not in skuobj.DefaultStoreDict: skuobj.DefaultStoreDict[defaultstorename] =3D = copy.deepcopy(skuobj.DefaultStoreDict[mindefaultstorename]) skuobj.HiiDefaultValue =3D skuobj.DefaultStoreDict[min= defaultstorename] - for skuname,skuid in SkuIds.items(): + for skuname, skuid in SkuIds.items(): if skuname not in PcdObj.SkuInfoList: nextskuid =3D self.SkuIdMgr.GetNextSkuId(skuname) while nextskuid not in PcdObj.SkuInfoList: @@ -2365,7 +2365,7 @@ class DscBuildData(PlatformBuildClassObject): AvailableSkuIdSet =3D copy.copy(self.SkuIds) DefaultStoresDefine =3D self._GetDefaultStores() =20 - for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, DefaultStore= , Dummy4,Dummy5 in RecordList: + for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, DefaultStore= , Dummy4, Dummy5 in RecordList: SkuName =3D SkuName.upper() SkuName =3D TAB_DEFAULT if SkuName =3D=3D TAB_COMMON else SkuN= ame DefaultStore =3D DefaultStore.upper() @@ -2378,14 +2378,14 @@ class DscBuildData(PlatformBuildClassObject): EdkLogger.error('build', PARAMETER_INVALID, 'DefaultStores= %s is not defined in [DefaultStores] section' % DefaultStore, File=3Dself.MetaFile, Line=3DD= ummy5) if "." not in TokenSpaceGuid: - PcdSet.add((PcdCName, TokenSpaceGuid, SkuName,DefaultStore= , Dummy5)) - PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid,DefaultStore] = =3D Setting + PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, DefaultStor= e, Dummy5)) + PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid, DefaultStore]= =3D Setting =20 =20 # Remove redundant PCD candidates, per the ARCH and SKU - for PcdCName, TokenSpaceGuid, SkuName,DefaultStore, Dummy4 in PcdS= et: + for PcdCName, TokenSpaceGuid, SkuName, DefaultStore, Dummy4 in Pcd= Set: =20 - Setting =3D PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceG= uid,DefaultStore] + Setting =3D PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceG= uid, DefaultStore] if Setting is None: continue VariableName, VariableGuid, VariableOffset, DefaultValue, VarA= ttribute =3D self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dum= my4) @@ -2429,10 +2429,10 @@ class DscBuildData(PlatformBuildClassObject): Skuitem =3D pcdObject.SkuInfoList[SkuName] Skuitem.DefaultStoreDict.update({DefaultStore:DefaultV= alue}) else: - SkuInfo =3D SkuInfoClass(SkuName, self.SkuIds[SkuName]= [0], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttr= ibute=3DVarAttribute,DefaultStore=3D{DefaultStore:DefaultValue}) + SkuInfo =3D SkuInfoClass(SkuName, self.SkuIds[SkuName]= [0], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttr= ibute=3DVarAttribute, DefaultStore=3D{DefaultStore:DefaultValue}) pcdObject.SkuInfoList[SkuName] =3D SkuInfo else: - SkuInfo =3D SkuInfoClass(SkuName, self.SkuIds[SkuName][0],= VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribut= e=3DVarAttribute,DefaultStore=3D{DefaultStore:DefaultValue}) + SkuInfo =3D SkuInfoClass(SkuName, self.SkuIds[SkuName][0],= VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribut= e=3DVarAttribute, DefaultStore=3D{DefaultStore:DefaultValue}) Pcds[PcdCName, TokenSpaceGuid] =3D PcdClassObject( PcdCName, TokenSpaceGuid, @@ -2463,7 +2463,7 @@ class DscBuildData(PlatformBuildClassObject): pcd.DefaultValue =3D pcdDecObject.DefaultValue if TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON not in pc= d.SkuInfoList: valuefromDec =3D pcdDecObject.DefaultValue - SkuInfo =3D SkuInfoClass(TAB_DEFAULT, '0', SkuInfoObj.Vari= ableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec,= VariableAttribute=3DSkuInfoObj.VariableAttribute,DefaultStore=3D{DefaultSto= re:valuefromDec}) + SkuInfo =3D SkuInfoClass(TAB_DEFAULT, '0', SkuInfoObj.Vari= ableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec,= VariableAttribute=3DSkuInfoObj.VariableAttribute, DefaultStore=3D{DefaultS= tore:valuefromDec}) pcd.SkuInfoList[TAB_DEFAULT] =3D SkuInfo elif TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON in pcd.= SkuInfoList: pcd.SkuInfoList[TAB_DEFAULT] =3D pcd.SkuInfoList[TAB_COMMO= N] @@ -2491,7 +2491,7 @@ class DscBuildData(PlatformBuildClassObject): invalidpcd =3D ",".join(invalidhii) EdkLogger.error('build', PCD_VARIABLE_INFO_ERROR, Message=3D'T= he same HII PCD must map to the same EFI variable for all SKUs', File=3Dsel= f.MetaFile, ExtraData=3Dinvalidpcd) =20 - map(self.FilterSkuSettings,Pcds.values()) + map(self.FilterSkuSettings, Pcds.values()) =20 return Pcds =20 @@ -2500,11 +2500,11 @@ class DscBuildData(PlatformBuildClassObject): invalidhii =3D [] for pcdname in Pcds: pcd =3D Pcds[pcdname] - varnameset =3D set(sku.VariableName for (skuid,sku) in pcd.Sku= InfoList.items()) + varnameset =3D set(sku.VariableName for (skuid, sku) in pcd.Sk= uInfoList.items()) if len(varnameset) > 1: - invalidhii.append(".".join((pcdname[1],pcdname[0]))) + invalidhii.append(".".join((pcdname[1], pcdname[0]))) if len(invalidhii): - return False,invalidhii + return False, invalidhii else: return True, [] ## Retrieve dynamic VPD PCD settings @@ -2528,7 +2528,7 @@ class DscBuildData(PlatformBuildClassObject): RecordList =3D self._RawData[Type, self._Arch] AvailableSkuIdSet =3D copy.copy(self.SkuIds) =20 - for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dumm= y4,Dummy5 in RecordList: + for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dumm= y4, Dummy5 in RecordList: SkuName =3D SkuName.upper() SkuName =3D TAB_DEFAULT if SkuName =3D=3D TAB_COMMON else SkuN= ame if SkuName not in AvailableSkuIdSet: @@ -2596,7 +2596,7 @@ class DscBuildData(PlatformBuildClassObject): del pcd.SkuInfoList[TAB_COMMON] =20 =20 - map(self.FilterSkuSettings,Pcds.values()) + map(self.FilterSkuSettings, Pcds.values()) return Pcds =20 ## Add external modules @@ -2661,7 +2661,7 @@ class DscBuildData(PlatformBuildClassObject): continue ModuleData =3D self._Bdb[ModuleFile, self._Arch, self._Tar= get, self._Toolchain] PkgSet.update(ModuleData.Packages) - self._DecPcds, self._GuidDict =3D GetDeclaredPcd(self, self._B= db, self._Arch, self._Target, self._Toolchain,PkgSet) + self._DecPcds, self._GuidDict =3D GetDeclaredPcd(self, self._B= db, self._Arch, self._Target, self._Toolchain, PkgSet) return self._DecPcds _Macros =3D property(_GetMacros) Arch =3D property(_GetArch, _SetArch) diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index baa5ddbb3917..ef2caf3b99bc 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -303,7 +303,7 @@ class MetaFileParser(object): for Item in GetSplitValueList(self._CurrentLine[1:-1], TAB_COMMA_S= PLIT): if Item =3D=3D '': continue - ItemList =3D GetSplitValueList(Item, TAB_SPLIT,3) + ItemList =3D GetSplitValueList(Item, TAB_SPLIT, 3) # different section should not mix in one section if self._SectionName !=3D '' and self._SectionName !=3D ItemLi= st[0].upper(): EdkLogger.error('Parser', FORMAT_INVALID, "Different secti= on names in the same section", @@ -421,7 +421,7 @@ class MetaFileParser(object): =20 ## Construct section Macro dict=20 def _ConstructSectionMacroDict(self, Name, Value): - ScopeKey =3D [(Scope[0], Scope[1],Scope[2]) for Scope in self._Sco= pe] + ScopeKey =3D [(Scope[0], Scope[1], Scope[2]) for Scope in self._Sc= ope] ScopeKey =3D tuple(ScopeKey) # # DecParser SectionType is a list, will contain more than one item= only in Pcd Section @@ -452,15 +452,15 @@ class MetaFileParser(object): continue =20 for ActiveScope in self._Scope: - Scope0, Scope1 ,Scope2=3D ActiveScope[0], ActiveScope[1],A= ctiveScope[2] - if(Scope0, Scope1,Scope2) not in Scope: + Scope0, Scope1, Scope2=3D ActiveScope[0], ActiveScope[1], = ActiveScope[2] + if(Scope0, Scope1, Scope2) not in Scope: break else: SpeSpeMacroDict.update(self._SectionsMacroDict[(SectionTyp= e, Scope)]) =20 for ActiveScope in self._Scope: - Scope0, Scope1,Scope2 =3D ActiveScope[0], ActiveScope[1],A= ctiveScope[2] - if(Scope0, Scope1,Scope2) not in Scope and (Scope0, TAB_CO= MMON, TAB_COMMON) not in Scope and (TAB_COMMON, Scope1, TAB_COMMON) not in = Scope: + Scope0, Scope1, Scope2 =3D ActiveScope[0], ActiveScope[1],= ActiveScope[2] + if(Scope0, Scope1, Scope2) not in Scope and (Scope0, TAB_C= OMMON, TAB_COMMON) not in Scope and (TAB_COMMON, Scope1, TAB_COMMON) not in= Scope: break else: ComSpeMacroDict.update(self._SectionsMacroDict[(SectionTyp= e, Scope)]) @@ -637,7 +637,7 @@ class InfParser(MetaFileParser): # Model, Value1, Value2, Value3, Arch, Platform, BelongsToItem= =3D-1, # LineBegin=3D-1, ColumnBegin=3D-1, LineEnd=3D-1, ColumnEnd=3D= -1, Enabled=3D-1 # - for Arch, Platform,_ in self._Scope: + for Arch, Platform, _ in self._Scope: LastItem =3D self._Store(self._SectionType, self._ValueList[0], self._ValueList[1], @@ -947,7 +947,7 @@ class DscParser(MetaFileParser): self._DirectiveParser() continue if Line[0] =3D=3D TAB_OPTION_START and not self._InSubsection: - EdkLogger.error("Parser", FILE_READ_FAILURE, "Missing the = '{' before %s in Line %s" % (Line, Index+1),ExtraData=3Dself.MetaFile) + EdkLogger.error("Parser", FILE_READ_FAILURE, "Missing the = '{' before %s in Line %s" % (Line, Index+1), ExtraData=3Dself.MetaFile) =20 if self._InSubsection: SectionType =3D self._SubsectionType @@ -1102,7 +1102,7 @@ class DscParser(MetaFileParser): @ParseMacro def _SkuIdParser(self): TokenList =3D GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT) - if len(TokenList) not in (2,3): + if len(TokenList) not in (2, 3): EdkLogger.error('Parser', FORMAT_INVALID, "Correct format is '= |[|]'", ExtraData=3Dself._CurrentLine, File=3Dself.Met= aFile, Line=3Dself._LineIndex + 1) self._ValueList[0:len(TokenList)] =3D TokenList @@ -1162,7 +1162,7 @@ class DscParser(MetaFileParser): =20 # Validate the datum type of Dynamic Defaul PCD and DynamicEx Defa= ult PCD ValueList =3D GetSplitValueList(self._ValueList[2]) - if len(ValueList) > 1 and ValueList[1] in [TAB_UINT8 , TAB_UINT16,= TAB_UINT32 , TAB_UINT64] \ + if len(ValueList) > 1 and ValueList[1] in [TAB_UINT8, TAB_UINT16, = TAB_UINT32, TAB_UINT64] \ and self._ItemType in [MODEL_PCD_DYNAMIC_DEF= AULT, MODEL_PCD_DYNAMIC_EX_DEFAULT]: EdkLogger.error('Parser', FORMAT_INVALID, "The datum type '%s'= of PCD is wrong" % ValueList[1], ExtraData=3Dself._CurrentLine, File=3Dself.Met= aFile, Line=3Dself._LineIndex + 1) @@ -1170,7 +1170,7 @@ class DscParser(MetaFileParser): # Validate the VariableName of DynamicHii and DynamicExHii for PCD= Entry must not be an empty string if self._ItemType in [MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_EX_= HII]: DscPcdValueList =3D GetSplitValueList(TokenList[1], TAB_VALUE_= SPLIT, 1) - if len(DscPcdValueList[0].replace('L','').replace('"','').stri= p()) =3D=3D 0: + if len(DscPcdValueList[0].replace('L', '').replace('"', '').st= rip()) =3D=3D 0: EdkLogger.error('Parser', FORMAT_INVALID, "The VariableNam= e field in the HII format PCD entry must not be an empty string", ExtraData=3Dself._CurrentLine, File=3Dself.Met= aFile, Line=3Dself._LineIndex + 1) =20 @@ -1306,7 +1306,7 @@ class DscParser(MetaFileParser): self._ContentIndex =3D 0 self._InSubsection =3D False while self._ContentIndex < len(self._Content) : - Id, self._ItemType, V1, V2, V3, S1, S2, S3,Owner, self._From, \ + Id, self._ItemType, V1, V2, V3, S1, S2, S3, Owner, self._From,= \ LineStart, ColStart, LineEnd, ColEnd, Enabled =3D self._Co= ntent[self._ContentIndex] =20 if self._From < 0: @@ -1324,8 +1324,8 @@ class DscParser(MetaFileParser): break Record =3D self._Content[self._ContentIndex] if LineStart =3D=3D Record[10] and LineEnd =3D=3D Record[1= 2]: - if [Record[5], Record[6],Record[7]] not in self._Scope: - self._Scope.append([Record[5], Record[6],Record[7]= ]) + if [Record[5], Record[6], Record[7]] not in self._Scop= e: + self._Scope.append([Record[5], Record[6], Record[7= ]]) self._ContentIndex +=3D 1 else: break @@ -1414,7 +1414,7 @@ class DscParser(MetaFileParser): MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_DEFAUL= T, MODEL_PCD_DYNAMIC_EX_HII, MODEL_PCD_DYNAMIC_EX_VPD): Records =3D self._RawTable.Query(PcdType, BelongsToItem=3D -1.= 0) - for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, Dummy4,ID,= Line in Records: + for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, Dummy4, ID= , Line in Records: Name =3D TokenSpaceGuid + '.' + PcdName if Name not in GlobalData.gPlatformOtherPcds: PcdLine =3D Line @@ -1810,7 +1810,7 @@ class DecParser(MetaFileParser): if self._DefinesCount > 1: EdkLogger.error('Parser', FORMAT_INVALID, 'Multiple [Defines] = section is exist.', self.MetaFile ) if self._DefinesCount =3D=3D 0: - EdkLogger.error('Parser', FORMAT_INVALID, 'No [Defines] sectio= n exist.',self.MetaFile) + EdkLogger.error('Parser', FORMAT_INVALID, 'No [Defines] sectio= n exist.', self.MetaFile) self._Done() =20 =20 @@ -1954,7 +1954,7 @@ class DecParser(MetaFileParser): self._CurrentStructurePcdName =3D "" else: if self._CurrentStructurePcdName !=3D TAB_SPLIT.join(P= cdNames[:2]): - EdkLogger.error('Parser', FORMAT_INVALID, "Pcd Nam= e does not match: %s and %s " % (self._CurrentStructurePcdName , TAB_SPLIT.= join(PcdNames[:2])), + EdkLogger.error('Parser', FORMAT_INVALID, "Pcd Nam= e does not match: %s and %s " % (self._CurrentStructurePcdName, TAB_SPLIT.j= oin(PcdNames[:2])), File=3Dself.MetaFile, Line=3Dself._LineInd= ex + 1) self._ValueList[1] =3D TAB_SPLIT.join(PcdNames[2:]) self._ValueList[2] =3D PcdTockens[1] diff --git a/BaseTools/Source/Python/Workspace/MetaFileTable.py b/BaseTools= /Source/Python/Workspace/MetaFileTable.py index d17487a4409d..69b2c40e7f1a 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileTable.py +++ b/BaseTools/Source/Python/Workspace/MetaFileTable.py @@ -258,8 +258,8 @@ class PackageTable(MetaFileTable): ValidType =3D "@ValidList" if oricomment.startswith("@Expression"): ValidType =3D "@Expression" - EdkLogger.error('Parser', FORMAT_INVALID, "The syntax for %s o= f PCD %s.%s is incorrect" % (ValidType,TokenSpaceGuid, PcdCName), - ExtraData=3Doricomment,File=3Dself.MetaFile, L= ine=3DLineNum) + EdkLogger.error('Parser', FORMAT_INVALID, "The syntax for %s o= f PCD %s.%s is incorrect" % (ValidType, TokenSpaceGuid, PcdCName), + ExtraData=3Doricomment, File=3Dself.MetaFile, = Line=3DLineNum) return set(), set(), set() return set(validateranges), set(validlists), set(expressions) ## Python class representation of table storing platform data @@ -308,7 +308,7 @@ class PlatformTable(MetaFileTable): # def Insert(self, Model, Value1, Value2, Value3, Scope1=3DTAB_ARCH_COMM= ON, Scope2=3DTAB_COMMON, Scope3=3DTAB_DEFAULT_STORES_DEFAULT,BelongsToItem= =3D-1, FromItem=3D-1, StartLine=3D-1, StartColumn=3D-1, EndLine=3D= -1, EndColumn=3D-1, Enabled=3D1): - (Value1, Value2, Value3, Scope1, Scope2,Scope3) =3D ConvertToSqlSt= ring((Value1, Value2, Value3, Scope1, Scope2,Scope3)) + (Value1, Value2, Value3, Scope1, Scope2, Scope3) =3D ConvertToSqlS= tring((Value1, Value2, Value3, Scope1, Scope2, Scope3)) return Table.Insert( self,=20 Model,=20 diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseToo= ls/Source/Python/Workspace/WorkspaceCommon.py index 713c1ddbddc9..e8f159b26204 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -53,7 +53,7 @@ def GetPackageList(Platform, BuildDatabase, Arch, Target,= Toolchain): # @retval: A dictionary contains instances of PcdClassObject with key (Pc= dCName, TokenSpaceGuid) # @retval: A dictionary contains real GUIDs of TokenSpaceGuid # -def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain,additi= onalPkgs): +def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain, addit= ionalPkgs): PkgList =3D GetPackageList(Platform, BuildDatabase, Arch, Target, Tool= chain) PkgList =3D set(PkgList) PkgList |=3D additionalPkgs diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sourc= e/Python/build/BuildReport.py index 55222c886d2d..454ea7d088b4 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -1190,7 +1190,7 @@ class PcdReport(object): FileWrite(File, Array) else: if Pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES: - if Value.startswith(('0x','0X')): + if Value.startswith(('0x', '0X')): Value =3D '{} ({:d})'.format(Value, int(Value, 0)) else: Value =3D "0x{:X} ({})".format(int(Value, 0), Valu= e) @@ -1300,9 +1300,9 @@ class PcdReport(object): else: if IsByteArray: if self.SkuSingle: - FileWrite(File, ' %-*s : %6s %10s =3D %s= ' % (self.MaxLen, ' ' , TypeName, '(' + Pcd.DatumType + ')', "{")) + FileWrite(File, ' %-*s : %6s %10s =3D %s= ' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', "{")) else: - FileWrite(File, ' %-*s : %6s %10s %10s = =3D %s' % (self.MaxLen, ' ' , TypeName, '(' + Pcd.DatumType + ')', '(' + Sk= uIdName + ')', "{")) + FileWrite(File, ' %-*s : %6s %10s %10s = =3D %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + Sku= IdName + ')', "{")) for Array in ArrayList: FileWrite(File, Array) else: @@ -1312,9 +1312,9 @@ class PcdReport(object): else: Value =3D "0x{:X} ({})".format(int(Val= ue, 0), Value) if self.SkuSingle: - FileWrite(File, ' %-*s : %6s %10s =3D %s= ' % (self.MaxLen, ' ' , TypeName, '(' + Pcd.DatumType + ')', Value)) + FileWrite(File, ' %-*s : %6s %10s =3D %s= ' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', Value)) else: - FileWrite(File, ' %-*s : %6s %10s %10s = =3D %s' % (self.MaxLen, ' ' , TypeName, '(' + Pcd.DatumType + ')', '(' + Sk= uIdName + ')', Value)) + FileWrite(File, ' %-*s : %6s %10s %10s = =3D %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + Sku= IdName + ')', Value)) if TypeName in ('DYNVPD', 'DEXVPD'): FileWrite(File, '%*s' % (self.MaxLen + 4, SkuInfo.= VpdOffset)) if IsStructure: diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index 344b006bc424..49869d9ee4e6 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -54,7 +54,7 @@ import Common.EdkLogger import Common.GlobalData as GlobalData from GenFds.GenFds import GenFds =20 -from collections import OrderedDict,defaultdict +from collections import OrderedDict, defaultdict =20 # Version and Copyright VersionNumber =3D "0.60" + ' ' + gBUILD_VERSION @@ -526,7 +526,7 @@ class BuildTask: BuildTask._Thread.acquire(True) =20 # start a new build thread - Bo,Bt =3D BuildTask._ReadyQueue.popitem() + Bo, Bt =3D BuildTask._ReadyQueue.popitem() =20 # move into running queue BuildTask._RunningQueueLock.acquire() @@ -840,7 +840,7 @@ class Build(): self.HashSkipModules =3D [] self.Db_Flag =3D False self.LaunchPrebuildFlag =3D False - self.PlatformBuildPath =3D os.path.join(GlobalData.gConfDirectory,= '.cache', '.PlatformBuild') + self.PlatformBuildPath =3D os.path.join(GlobalData.gConfDirectory,= '.cache', '.PlatformBuild') if BuildOptions.CommandLength: GlobalData.gCommandMaxLength =3D BuildOptions.CommandLength =20 @@ -1133,7 +1133,7 @@ class Build(): # and preserve them for the rest of the main build step, becau= se the child process environment will # evaporate as soon as it exits, we cannot get it in build ste= p. # - PrebuildEnvFile =3D os.path.join(GlobalData.gConfDirectory,'.c= ache','.PrebuildEnv') + PrebuildEnvFile =3D os.path.join(GlobalData.gConfDirectory, '.= cache', '.PrebuildEnv') if os.path.isfile(PrebuildEnvFile): os.remove(PrebuildEnvFile) if os.path.isfile(self.PlatformBuildPath): @@ -1173,7 +1173,7 @@ class Build(): f =3D open(PrebuildEnvFile) envs =3D f.readlines() f.close() - envs =3D itertools.imap(lambda l: l.split('=3D',1), envs) + envs =3D itertools.imap(lambda l: l.split('=3D', 1), envs) envs =3D itertools.ifilter(lambda l: len(l) =3D=3D 2, envs) envs =3D itertools.imap(lambda l: [i.strip() for i in l], = envs) os.environ.update(dict(envs)) @@ -2358,7 +2358,7 @@ def MyOptionParser(): Parser.add_option("-D", "--define", action=3D"append", type=3D"string"= , dest=3D"Macros", help=3D"Macro: \"Name [=3D Value]\".") =20 Parser.add_option("-y", "--report-file", action=3D"store", dest=3D"Rep= ortFile", help=3D"Create/overwrite the report to the specified filename.") - Parser.add_option("-Y", "--report-type", action=3D"append", type=3D"ch= oice", choices=3D['PCD','LIBRARY','FLASH','DEPEX','BUILD_FLAGS','FIXED_ADDR= ESS','HASH','EXECUTION_ORDER'], dest=3D"ReportType", default=3D[], + Parser.add_option("-Y", "--report-type", action=3D"append", type=3D"ch= oice", choices=3D['PCD', 'LIBRARY', 'FLASH', 'DEPEX', 'BUILD_FLAGS', 'FIXED= _ADDRESS', 'HASH', 'EXECUTION_ORDER'], dest=3D"ReportType", default=3D[], help=3D"Flags that control the type of build report to generate. = Must be one of: [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS, HA= SH, EXECUTION_ORDER]. "\ "To specify more than one flag, repeat this option on the com= mand line and the default flag set is [PCD, LIBRARY, FLASH, DEPEX, HASH, BU= ILD_FLAGS, FIXED_ADDRESS]") Parser.add_option("-F", "--flag", action=3D"store", type=3D"string", d= est=3D"Flag", diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py index 0a86686e3688..c634dfe43aa3 100644 --- a/BaseTools/Tests/TestTools.py +++ b/BaseTools/Tests/TestTools.py @@ -161,7 +161,7 @@ class BaseToolsTest(unittest.TestCase): if minlen is None: minlen =3D 1024 if maxlen is None: maxlen =3D minlen return ''.join( - [chr(random.randint(0,255)) + [chr(random.randint(0, 255)) for x in range(random.randint(minlen, maxlen)) ]) =20 diff --git a/BaseTools/gcc/mingw-gcc-build.py b/BaseTools/gcc/mingw-gcc-bui= ld.py index 49ff656c066f..3bf524123d0f 100755 --- a/BaseTools/gcc/mingw-gcc-build.py +++ b/BaseTools/gcc/mingw-gcc-build.py @@ -187,7 +187,7 @@ class Config: return path =20 def MakeDirs(self): - for path in (self.src_dir, self.build_dir,self.prefix, self.symlin= ks): + for path in (self.src_dir, self.build_dir, self.prefix, self.symli= nks): if not os.path.exists(path): os.makedirs(path) =20 --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel