From nobody Mon Apr 29 23:15:57 2024 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 1529556259524180.22730587728665; Wed, 20 Jun 2018 21:44:19 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 64A1A211D5054; Wed, 20 Jun 2018 21:44:18 -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 3ECDA211CFFE0 for ; Wed, 20 Jun 2018 21:44:15 -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:12 +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:27 +0800 Message-Id: <20180621044346.28495-2-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 01/20] BaseTools: Fix a typo in ini.py 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: Jaben Carsey , 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" "if mis not None:" =3D> "if m is not None:" Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Jaben Carsey Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin Reviewed-by: Jaben Carsey --- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py= | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/ini.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/ba= semodel/ini.py index bf1040d6bac4..ea83327052f2 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/i= ni.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/i= ni.py @@ -122,7 +122,7 @@ class BaseINIFile(object): continue =20 m =3D section_re.match(templine) - if mis not None: # found a section + if m is not None: # found a section inGlobal =3D False # Finish the latest section first if len(sObjs) !=3D 0: --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 152955626465319.48303138917447; Wed, 20 Jun 2018 21:44:24 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CB85C211D505D; Wed, 20 Jun 2018 21:44:20 -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 9F7CA211D505A for ; Wed, 20 Jun 2018 21:44:18 -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:14 +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:28 +0800 Message-Id: <20180621044346.28495-3-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 02/20] BaseTools: Refactor python except statements 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" Convert "except ... ," to "except ... as" to be compatible with python3. Based on "futurize -f lib2to3.fixes.fix_except" Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxyge= n.py | 4 +- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxyg= engen.py | 2 +- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxyg= engen_spec.py | 2 +- BaseTools/Scripts/UpdateBuildVersions.py = | 12 +- BaseTools/Source/Python/AutoGen/AutoGen.py = | 2 +- BaseTools/Source/Python/AutoGen/GenDepex.py = | 2 +- BaseTools/Source/Python/AutoGen/GenMake.py = | 2 +- BaseTools/Source/Python/AutoGen/UniClassObject.py = | 4 +- BaseTools/Source/Python/Common/Expression.py = | 22 +-- BaseTools/Source/Python/Common/Misc.py = | 8 +- BaseTools/Source/Python/Common/RangeExpression.py = | 6 +- BaseTools/Source/Python/Common/VpdInfoFile.py = | 2 +- BaseTools/Source/Python/Ecc/CParser.py = | 142 ++++++++++---------- BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py = | 2 +- BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py = | 14 +- BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py = | 2 +- BaseTools/Source/Python/Ecc/c.py = | 2 +- BaseTools/Source/Python/Eot/CParser.py = | 142 ++++++++++---------- BaseTools/Source/Python/GenFds/FdfParser.py = | 10 +- BaseTools/Source/Python/GenFds/GenFds.py = | 4 +- BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py = | 2 +- BaseTools/Source/Python/TargetTool/TargetTool.py = | 2 +- BaseTools/Source/Python/Trim/Trim.py = | 4 +- BaseTools/Source/Python/UPT/Core/DependencyRules.py = | 4 +- BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py = | 4 +- BaseTools/Source/Python/UPT/Core/IpiDb.py = | 2 +- BaseTools/Source/Python/UPT/Core/PackageFile.py = | 12 +- BaseTools/Source/Python/UPT/InstallPkg.py = | 2 +- BaseTools/Source/Python/UPT/InventoryWs.py = | 2 +- BaseTools/Source/Python/UPT/Library/CommentParsing.py = | 2 +- BaseTools/Source/Python/UPT/Library/ExpressionValidate.py = | 8 +- BaseTools/Source/Python/UPT/Library/UniClassObject.py = | 8 +- BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py = | 2 +- BaseTools/Source/Python/UPT/MkPkg.py = | 2 +- BaseTools/Source/Python/UPT/ReplacePkg.py = | 2 +- BaseTools/Source/Python/UPT/RmPkg.py = | 2 +- BaseTools/Source/Python/UPT/TestInstall.py = | 4 +- BaseTools/Source/Python/UPT/UPT.py = | 4 +- BaseTools/Source/Python/Workspace/DscBuildData.py = | 14 +- BaseTools/Source/Python/Workspace/InfBuildData.py = | 2 +- BaseTools/Source/Python/Workspace/MetaFileParser.py = | 12 +- BaseTools/Source/Python/Workspace/MetaFileTable.py = | 4 +- BaseTools/Source/Python/build/BuildReport.py = | 4 +- BaseTools/Source/Python/build/build.py = | 10 +- BaseTools/Tests/CheckPythonSyntax.py = | 2 +- BaseTools/gcc/mingw-gcc-build.py = | 2 +- 46 files changed, 254 insertions(+), 250 deletions(-) diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/doxygen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugin= s/basemodel/doxygen.py index 488949f24b6f..a177590af597 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/d= oxygen.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/d= oxygen.py @@ -115,7 +115,7 @@ class DoxygenFile(Page): f =3D open(self.mFilename, 'w') f.write('\n'.join(str)) f.close() - except IOError, e: + except IOError as e: ErrorMsg ('Fail to write file %s' % self.mFilename) return False =20 @@ -429,7 +429,7 @@ class DoxygenConfigFile: f =3D open(path, 'w') f.write(text) f.close() - except IOError, e: + except IOError as e: ErrorMsg ('Fail to generate doxygen config file %s' % path) return False =20 diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2= /model/doxygengen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPl= ugins/edk2/model/doxygengen.py index 94b6588c0ddf..c22d362ff3e1 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py @@ -1001,7 +1001,7 @@ class PackageDocumentAction(DoxygenAction): =20 try: file =3D open(path, 'rb') - except (IOError, OSError), msg: + except (IOError, OSError) as msg: return None =20 t =3D file.read() diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2= /model/doxygengen_spec.py b/BaseTools/Scripts/PackageDocumentTools/plugins/= EdkPlugins/edk2/model/doxygengen_spec.py index ca55929eda9a..4bae6968a96e 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen_spec.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen_spec.py @@ -1004,7 +1004,7 @@ class PackageDocumentAction(DoxygenAction): =20 try: file =3D open(path, 'rb') - except (IOError, OSError), msg: + except (IOError, OSError) as msg: return None =20 t =3D file.read() diff --git a/BaseTools/Scripts/UpdateBuildVersions.py b/BaseTools/Scripts/U= pdateBuildVersions.py index e62030aa9f0f..74e3ae4302e8 100755 --- a/BaseTools/Scripts/UpdateBuildVersions.py +++ b/BaseTools/Scripts/UpdateBuildVersions.py @@ -90,7 +90,8 @@ def ShellCommandResults(CmdLine, Opt): sys.stderr.flush() returnValue =3D err_val.returncode =20 - except IOError as (errno, strerror): + except IOError as xxx_todo_changeme: + (errno, strerror) =3D xxx_todo_changeme.args file_list.close() if not Opt.silent: sys.stderr.write("I/O ERROR : %s : %s\n" % (str(errno), strerr= or)) @@ -100,7 +101,8 @@ def ShellCommandResults(CmdLine, Opt): sys.stderr.flush() returnValue =3D errno =20 - except OSError as (errno, strerror): + except OSError as xxx_todo_changeme1: + (errno, strerror) =3D xxx_todo_changeme1.args file_list.close() if not Opt.silent: sys.stderr.write("OS ERROR : %s : %s\n" % (str(errno), strerro= r)) @@ -210,13 +212,15 @@ def RevertCmd(Filename, Opt): sys.stderr.write("Subprocess ERROR : %s\n" % err_val) sys.stderr.flush() =20 - except IOError as (errno, strerror): + except IOError as xxx_todo_changeme2: + (errno, strerror) =3D xxx_todo_changeme2.args if not Opt.silent: sys.stderr.write("I/O ERROR : %d : %s\n" % (str(errno), strerr= or)) sys.stderr.write("ERROR : this command failed : %s\n" % CmdLin= e) sys.stderr.flush() =20 - except OSError as (errno, strerror): + except OSError as xxx_todo_changeme3: + (errno, strerror) =3D xxx_todo_changeme3.args if not Opt.silent: sys.stderr.write("OS ERROR : %d : %s\n" % (str(errno), strerro= r)) sys.stderr.write("ERROR : this command failed : %s\n" % CmdLin= e) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index ed0be3bc74f9..72d801df8fd5 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -2220,7 +2220,7 @@ class PlatformAutoGen(AutoGen): if ToPcd.DefaultValue: try: ToPcd.DefaultValue =3D ValueExpressionEx(ToPcd.Default= Value, ToPcd.DatumType, self._GuidDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s]= Value "%s", %s' %(ToPcd.TokenSpaceGuidCName, ToPcd.TokenCName, ToPcd.Defau= ltValue, Value), File=3Dself.MetaFile) =20 diff --git a/BaseTools/Source/Python/AutoGen/GenDepex.py b/BaseTools/Source= /Python/AutoGen/GenDepex.py index ed5df2b75440..b69788c37e08 100644 --- a/BaseTools/Source/Python/AutoGen/GenDepex.py +++ b/BaseTools/Source/Python/AutoGen/GenDepex.py @@ -449,7 +449,7 @@ def Main(): os.utime(Option.OutputFile, None) else: Dpx.Generate() - except BaseException, X: + except BaseException as X: EdkLogger.quiet("") if Option is not None and Option.debug is not None: EdkLogger.quiet(traceback.format_exc()) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index 8541372159a2..48b66c570e0a 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -1030,7 +1030,7 @@ cleanlib: else: try: Fd =3D open(F.Path, 'r') - except BaseException, X: + except BaseException as X: EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData= =3DF.Path + "\n\t" + str(X)) =20 FileContent =3D Fd.read() diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/= Source/Python/AutoGen/UniClassObject.py index 5a3c2547783b..06cf3e7d5162 100644 --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py @@ -254,7 +254,7 @@ class UniFileClassObject(object): if len(Lang) !=3D 3: try: FileIn =3D UniFileClassObject.OpenUniFile(LongFilePath(Fil= e.Path)) - except UnicodeError, X: + except UnicodeError as X: EdkLogger.error("build", FILE_READ_FAILURE, "File read fai= lure: %s" % str(X), ExtraData=3DFile); except: EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=3DFi= le); @@ -393,7 +393,7 @@ class UniFileClassObject(object): =20 try: FileIn =3D UniFileClassObject.OpenUniFile(LongFilePath(File.Pa= th)) - except UnicodeError, X: + except UnicodeError as X: EdkLogger.error("build", FILE_READ_FAILURE, "File read failure= : %s" % str(X), ExtraData=3DFile.Path); except: EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=3DFile.P= ath); diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Sourc= e/Python/Common/Expression.py index 9e9d9fdc02e7..7b04dcdb36cc 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -307,7 +307,7 @@ class ValueExpression(BaseExpression): } try: Val =3D eval(EvalStr, {}, Dict) - except Exception, Excpt: + except Exception as Excpt: raise BadExpression(str(Excpt)) =20 if Operator in {'and', 'or'}: @@ -425,7 +425,7 @@ class ValueExpression(BaseExpression): continue try: Val =3D self.Eval(Op, Val, EvalFunc()) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept =3D Warn Val =3D Warn.result return Val @@ -464,7 +464,7 @@ class ValueExpression(BaseExpression): Op +=3D ' ' + self._Token try: Val =3D self.Eval(Op, Val, self._RelExpr()) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept =3D Warn Val =3D Warn.result return Val @@ -490,14 +490,14 @@ class ValueExpression(BaseExpression): Val =3D self._UnaryExpr() try: return self.Eval('not', Val) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept =3D Warn return Warn.result if self._IsOperator({"~"}): Val =3D self._UnaryExpr() try: return self.Eval('~', Val) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept =3D Warn return Warn.result return self._IdenExpr() @@ -816,9 +816,9 @@ class ValueExpressionEx(ValueExpression): elif self.PcdType in TAB_PCD_NUMERIC_TYPES and (PcdValue.start= swith("'") or \ PcdValue.startswith('"') or PcdValue.startswith("L'"= ) or PcdValue.startswith('L"') or PcdValue.startswith('{')): raise BadExpression - except WrnExpression, Value: + except WrnExpression as Value: PcdValue =3D Value.result - except BadExpression, Value: + except BadExpression as Value: if self.PcdType in TAB_PCD_NUMERIC_TYPES: PcdValue =3D PcdValue.strip() if PcdValue.startswith('{') and PcdValue.endswith('}'): @@ -854,7 +854,7 @@ class ValueExpressionEx(ValueExpression): tmpValue =3D int(Item, 0) if tmpValue > 255: raise BadExpression("Byte array numbe= r %s should less than 0xFF." % Item) - except BadExpression, Value: + except BadExpression as Value: raise BadExpression(Value) except ValueError: pass @@ -870,7 +870,7 @@ class ValueExpressionEx(ValueExpression): else: try: TmpValue, Size =3D ParseFieldValue(PcdValue) - except BadExpression, Value: + except BadExpression as Value: raise BadExpression("Type: %s, Value: %s, %s" % (s= elf.PcdType, PcdValue, Value)) if type(TmpValue) =3D=3D type(''): try: @@ -1030,8 +1030,8 @@ if __name__ =3D=3D '__main__': try: print ValueExpression(input)(True) print ValueExpression(input)(False) - except WrnExpression, Ex: + except WrnExpression as Ex: print Ex.result print str(Ex) - except Exception, Ex: + except Exception as Ex: print str(Ex) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Pyth= on/Common/Misc.py index 24706ebe500f..5197818d3f27 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -478,7 +478,7 @@ def SaveFileOnChange(File, Content, IsBinaryFile=3DTrue= ): Fd =3D open(File, "wb") Fd.write(Content) Fd.close() - except IOError, X: + except IOError as X: EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData=3D'IOError %s= ' % X) =20 return True @@ -512,7 +512,7 @@ def DataRestore(File): try: Fd =3D open(File, 'rb') Data =3D cPickle.load(Fd) - except Exception, e: + except Exception as e: EdkLogger.verbose("Failed to load [%s]\n\t%s" % (File, str(e))) Data =3D None finally: @@ -1278,7 +1278,7 @@ def ParseDevPathValue (Value): try: p =3D subprocess.Popen(Cmd, stdout=3Dsubprocess.PIPE, stderr=3Dsub= process.PIPE, shell=3DTrue) out, err =3D p.communicate() - except Exception, X: + except Exception as X: raise BadExpression("DevicePath: %s" % (str(X)) ) finally: subprocess._cleanup() @@ -1327,7 +1327,7 @@ def ParseFieldValue (Value): Value =3D Value[1:-1] try: Value =3D "'" + uuid.UUID(Value).get_bytes_le() + "'" - except ValueError, Message: + except ValueError as Message: raise BadExpression(Message) Value, Size =3D ParseFieldValue(Value) return Value, 16 diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/= Source/Python/Common/RangeExpression.py index 7f504d6e310c..b6f99447057c 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -422,7 +422,7 @@ class RangeExpression(BaseExpression): Op =3D self._Token try: Val =3D self.Eval(Op, Val, EvalFunc()) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept =3D Warn Val =3D Warn.result return Val @@ -445,7 +445,7 @@ class RangeExpression(BaseExpression): Op +=3D ' ' + self._Token try: Val =3D self.Eval(Op, Val, self._RelExpr()) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept =3D Warn Val =3D Warn.result return Val @@ -457,7 +457,7 @@ class RangeExpression(BaseExpression): Val =3D self._NeExpr() try: return self.Eval(Token, Val) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept =3D Warn return Warn.result return self._IdenExpr() diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Sour= ce/Python/Common/VpdInfoFile.py index 2b447772eafe..8ff544ed769d 100644 --- a/BaseTools/Source/Python/Common/VpdInfoFile.py +++ b/BaseTools/Source/Python/Common/VpdInfoFile.py @@ -245,7 +245,7 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName): stdout=3Dsubprocess.PIPE,=20 stderr=3D subprocess.PIPE, shell=3DTrue) - except Exception, X: + except Exception as X: EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, ExtraData= =3Dstr(X)) (out, error) =3D PopenObject.communicate() print out diff --git a/BaseTools/Source/Python/Ecc/CParser.py b/BaseTools/Source/Pyth= on/Ecc/CParser.py index 94711a9a378a..ddc6cbd506aa 100644 --- a/BaseTools/Source/Python/Ecc/CParser.py +++ b/BaseTools/Source/Python/Ecc/CParser.py @@ -173,7 +173,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -532,7 +532,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -809,7 +809,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -964,7 +964,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1092,7 +1092,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1162,7 +1162,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1216,7 +1216,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1263,7 +1263,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1432,7 +1432,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1465,7 +1465,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1589,7 +1589,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1636,7 +1636,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1699,7 +1699,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1742,7 +1742,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1861,7 +1861,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1921,7 +1921,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2003,7 +2003,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2158,7 +2158,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2223,7 +2223,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2275,7 +2275,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2322,7 +2322,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2464,7 +2464,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3056,7 +3056,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3206,7 +3206,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3462,7 +3462,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3528,7 +3528,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3617,7 +3617,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3825,7 +3825,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3881,7 +3881,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3971,7 +3971,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4219,7 +4219,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4570,7 +4570,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4690,7 +4690,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4770,7 +4770,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4835,7 +4835,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4933,7 +4933,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5012,7 +5012,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5103,7 +5103,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5203,7 +5203,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5355,7 +5355,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5583,7 +5583,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5644,7 +5644,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5691,7 +5691,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5789,7 +5789,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5995,7 +5995,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6065,7 +6065,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6100,7 +6100,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8135,7 +8135,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8170,7 +8170,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8217,7 +8217,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8285,7 +8285,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8355,7 +8355,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8415,7 +8415,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8475,7 +8475,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8535,7 +8535,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8595,7 +8595,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8669,7 +8669,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8743,7 +8743,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8817,7 +8817,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9058,7 +9058,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9155,7 +9155,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9228,7 +9228,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9301,7 +9301,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -12467,7 +12467,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -12560,7 +12560,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -14530,7 +14530,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16251,7 +16251,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16322,7 +16322,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16435,7 +16435,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16586,7 +16586,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16703,7 +16703,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py= b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py index 760f88cc7294..fc65e9a2bd3c 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py @@ -98,7 +98,7 @@ class Table(object): SqlCommand =3D """drop table IF EXISTS %s""" % self.Table try: self.Cur.execute(SqlCommand) - except Exception, e: + except Exception as e: print "An error occurred when Drop a table:", e.args[0] =20 ## Get count diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.p= y b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py index 3749f6a2699e..fd96bb9a3c0b 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py @@ -1183,7 +1183,7 @@ class DscParser(MetaFileParser): =20 try: Processer[self._ItemType]() - except EvaluationException, Excpt: + except EvaluationException as Excpt: #=20 # Only catch expression evaluation error here. We need to = report # the precise number of line on which the error occurred @@ -1192,7 +1192,7 @@ class DscParser(MetaFileParser): # EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expre= ssion: %s" % str(Excpt), # File=3Dself._FileWithError, ExtraData=3D= ' '.join(self._ValueList), # Line=3Dself._LineIndex+1) - except MacroException, Excpt: + except MacroException as Excpt: EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt), File=3Dself._FileWithError, ExtraData=3D' = '.join(self._ValueList),=20 Line=3Dself._LineIndex+1) @@ -1305,10 +1305,10 @@ class DscParser(MetaFileParser): Macros.update(GlobalData.gGlobalDefines) try: Result =3D ValueExpression(self._ValueList[1], Macros)() - except SymbolNotFound, Exc: + except SymbolNotFound as Exc: EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueLi= st[1]) Result =3D False - except WrnExpression, Excpt: + except WrnExpression as Excpt: #=20 # Catch expression evaluation warning here. We need to rep= ort # the precise number of line and return the evaluation res= ult @@ -1317,7 +1317,7 @@ class DscParser(MetaFileParser): File=3Dself._FileWithError, ExtraData=3D' = '.join(self._ValueList),=20 Line=3Dself._LineIndex+1) Result =3D Excpt.result - except BadExpression, Exc: + except BadExpression as Exc: EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueLi= st[1]) Result =3D False =20 @@ -1437,13 +1437,13 @@ class DscParser(MetaFileParser): PcdValue =3D ValueList[0] =20 try: ValueList[0] =3D ValueExpression(PcdValue, self._Macros)(T= rue) - except WrnExpression, Value: + except WrnExpression as Value: ValueList[0] =3D Value.result =20 else: PcdValue =3D ValueList[-1] try: ValueList[-1] =3D ValueExpression(PcdValue, self._Macros)(= True) - except WrnExpression, Value: + except WrnExpression as Value: ValueList[-1] =3D Value.result =20 if ValueList[-1] =3D=3D 'True': diff --git a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py b/BaseTools/Sou= rce/Python/Ecc/Xml/XmlRoutines.py index a86f19624c44..d5fb80fcf982 100644 --- a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py +++ b/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py @@ -214,7 +214,7 @@ def XmlParseFile(FileName): Dom =3D xml.dom.minidom.parse(XmlFile) XmlFile.close() return Dom - except Exception, X: + except Exception as X: print X return "" =20 diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc= /c.py index 93ee1990ba28..99b22725e6ba 100644 --- a/BaseTools/Source/Python/Ecc/c.py +++ b/BaseTools/Source/Python/Ecc/c.py @@ -2633,7 +2633,7 @@ if __name__ =3D=3D '__main__': # CollectSourceCodeDataIntoDB(sys.argv[1]) try: test_file =3D sys.argv[1] - except IndexError, v: + except IndexError as v: print "Usage: %s filename" % sys.argv[0] sys.exit(1) MsgList =3D CheckFuncHeaderDoxygenComments(test_file) diff --git a/BaseTools/Source/Python/Eot/CParser.py b/BaseTools/Source/Pyth= on/Eot/CParser.py index 94711a9a378a..ddc6cbd506aa 100644 --- a/BaseTools/Source/Python/Eot/CParser.py +++ b/BaseTools/Source/Python/Eot/CParser.py @@ -173,7 +173,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -532,7 +532,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -809,7 +809,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -964,7 +964,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1092,7 +1092,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1162,7 +1162,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1216,7 +1216,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1263,7 +1263,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1432,7 +1432,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1465,7 +1465,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1589,7 +1589,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1636,7 +1636,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1699,7 +1699,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1742,7 +1742,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1861,7 +1861,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1921,7 +1921,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2003,7 +2003,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2158,7 +2158,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2223,7 +2223,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2275,7 +2275,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2322,7 +2322,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2464,7 +2464,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3056,7 +3056,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3206,7 +3206,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3462,7 +3462,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3528,7 +3528,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3617,7 +3617,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3825,7 +3825,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3881,7 +3881,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3971,7 +3971,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4219,7 +4219,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4570,7 +4570,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4690,7 +4690,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4770,7 +4770,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4835,7 +4835,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4933,7 +4933,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5012,7 +5012,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5103,7 +5103,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5203,7 +5203,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5355,7 +5355,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5583,7 +5583,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5644,7 +5644,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5691,7 +5691,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5789,7 +5789,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5995,7 +5995,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6065,7 +6065,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6100,7 +6100,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8135,7 +8135,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8170,7 +8170,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8217,7 +8217,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8285,7 +8285,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8355,7 +8355,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8415,7 +8415,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8475,7 +8475,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8535,7 +8535,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8595,7 +8595,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8669,7 +8669,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8743,7 +8743,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8817,7 +8817,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9058,7 +9058,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9155,7 +9155,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9228,7 +9228,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9301,7 +9301,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -12467,7 +12467,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -12560,7 +12560,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -14530,7 +14530,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16251,7 +16251,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16322,7 +16322,7 @@ class CParser(Parser): retval.stop =3D self.input.LT(-1) =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16435,7 +16435,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16586,7 +16586,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16703,7 +16703,7 @@ class CParser(Parser): =20 =20 =20 - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index 78cb049c6187..20f3e3999b90 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -921,7 +921,7 @@ class FdfParser: return ValueExpression(Expression, MacroPcdDict)(True) else: return ValueExpression(Expression, MacroPcdDict)() - except WrnExpression, Excpt: + except WrnExpression as Excpt: #=20 # Catch expression evaluation warning here. We need to rep= ort # the precise number of line and return the evaluation res= ult @@ -930,7 +930,7 @@ class FdfParser: File=3Dself.FileName, ExtraData=3Dself.__C= urrentLine(),=20 Line=3DLine) return Excpt.result - except Exception, Excpt: + except Exception as Excpt: if hasattr(Excpt, 'Pcd'): if Excpt.Pcd in GlobalData.gPlatformOtherPcds: Info =3D GlobalData.gPlatformOtherPcds[Excpt.Pcd] @@ -1367,7 +1367,7 @@ class FdfParser: while self.__GetFd() or self.__GetFv() or self.__GetFmp() or s= elf.__GetCapsule() or self.__GetVtf() or self.__GetRule() or self.__GetOpti= onRom(): pass =20 - except Warning, X: + except Warning as X: self.__UndoToken() #'\n\tGot Token: \"%s\" from File %s\n' % (self.__Token, FileL= ineTuple[0]) + \ # At this point, the closest parent would be the included file= itself @@ -4764,7 +4764,7 @@ if __name__ =3D=3D "__main__": import sys try: test_file =3D sys.argv[1] - except IndexError, v: + except IndexError as v: print "Usage: %s filename" % sys.argv[0] sys.exit(1) =20 @@ -4772,7 +4772,7 @@ if __name__ =3D=3D "__main__": try: parser.ParseFile() parser.CycleReferenceCheck() - except Warning, X: + except Warning as X: print str(X) else: print "Success!" diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Py= thon/GenFds/GenFds.py index 339b99867369..ba3950dacd8a 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -335,10 +335,10 @@ def main(): """Display FV space info.""" GenFds.DisplayFvSpaceInfo(FdfParserObj) =20 - except FdfParser.Warning, X: + except FdfParser.Warning as X: EdkLogger.error(X.ToolName, FORMAT_INVALID, File=3DX.FileName, Lin= e=3DX.LineNumber, ExtraData=3DX.Message, RaiseError=3DFalse) ReturnCode =3D FORMAT_INVALID - except FatalError, X: + except FatalError as X: if Options.debug is not None: import traceback EdkLogger.quiet(traceback.format_exc()) diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseT= ools/Source/Python/GenFds/GenFdsGlobalVariable.py index c2e82de891d3..c1d656227609 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -721,7 +721,7 @@ class GenFdsGlobalVariable: =20 try: PopenObject =3D subprocess.Popen(' '.join(cmd), stdout=3Dsubpr= ocess.PIPE, stderr=3Dsubprocess.PIPE, shell=3DTrue) - except Exception, X: + except Exception as X: EdkLogger.error("GenFds", COMMAND_FAILURE, ExtraData=3D"%s: %s= " % (str(X), cmd[0])) (out, error) =3D PopenObject.communicate() =20 diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/S= ource/Python/TargetTool/TargetTool.py index ecac316b7a3a..9fb89549cc29 100644 --- a/BaseTools/Source/Python/TargetTool/TargetTool.py +++ b/BaseTools/Source/Python/TargetTool/TargetTool.py @@ -253,7 +253,7 @@ if __name__ =3D=3D '__main__': FileHandle.RWFile('#', '=3D', 0) else: FileHandle.RWFile('#', '=3D', 1) - except Exception, e: + except Exception as e: last_type, last_value, last_tb =3D sys.exc_info() traceback.print_exception(last_type, last_value, last_tb) =20 diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python= /Trim/Trim.py index a74075859148..b512d15243f8 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -668,7 +668,7 @@ def Main(): EdkLogger.SetLevel(CommandOptions.LogLevel + 1) else: EdkLogger.SetLevel(CommandOptions.LogLevel) - except FatalError, X: + except FatalError as X: return 1 =20 try: @@ -688,7 +688,7 @@ def Main(): if CommandOptions.OutputFile is None: CommandOptions.OutputFile =3D os.path.splitext(InputFile)[= 0] + '.iii' TrimPreprocessedFile(InputFile, CommandOptions.OutputFile, Com= mandOptions.ConvertHex, CommandOptions.TrimLong) - except FatalError, X: + except FatalError as X: import platform import traceback if CommandOptions is not None and CommandOptions.LogLevel <=3D Edk= Logger.DEBUG_9: diff --git a/BaseTools/Source/Python/UPT/Core/DependencyRules.py b/BaseTool= s/Source/Python/UPT/Core/DependencyRules.py index 2af847ed2e0b..34f56e7bb487 100644 --- a/BaseTools/Source/Python/UPT/Core/DependencyRules.py +++ b/BaseTools/Source/Python/UPT/Core/DependencyRules.py @@ -394,7 +394,7 @@ def VerifyRemoveModuleDep(Path, DpPackagePathList): return False else: return True - except FatalError, ErrCode: + except FatalError as ErrCode: if ErrCode.message =3D=3D EDK1_INF_ERROR: Logger.Warn("UPT", ST.WRN_EDK1_INF_FOUND%Path) @@ -446,7 +446,7 @@ def VerifyReplaceModuleDep(Path, DpPackagePathList, Oth= erPkgList): return False else: return True - except FatalError, ErrCode: + except FatalError as ErrCode: if ErrCode.message =3D=3D EDK1_INF_ERROR: Logger.Warn("UPT", ST.WRN_EDK1_INF_FOUND%Path) diff --git a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py b= /BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py index 9c55e0ea88a7..81c67fb510a2 100644 --- a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py +++ b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py @@ -155,7 +155,7 @@ class DistributionPackageClass(object): ModuleObj.GetName(), \ ModuleObj.GetCombinePath())] =3D Modul= eObj PackageObj.SetModuleDict(ModuleDict) - except FatalError, ErrCode: + except FatalError as ErrCode: if ErrCode.message =3D=3D EDK1_INF_ERROR: Logger.Warn("UPT", ST.WRN_EDK1_INF_FOUND%Filename) @@ -181,7 +181,7 @@ class DistributionPackageClass(object): ModuleObj.GetName(),=20 ModuleObj.GetCombinePath()) self.ModuleSurfaceArea[ModuleKey] =3D ModuleObj - except FatalError, ErrCode: + except FatalError as ErrCode: if ErrCode.message =3D=3D EDK1_INF_ERROR: Logger.Error("UPT", EDK1_INF_ERROR, diff --git a/BaseTools/Source/Python/UPT/Core/IpiDb.py b/BaseTools/Source/P= ython/UPT/Core/IpiDb.py index 78d67ab31e1e..97ad47a58dbb 100644 --- a/BaseTools/Source/Python/UPT/Core/IpiDb.py +++ b/BaseTools/Source/Python/UPT/Core/IpiDb.py @@ -230,7 +230,7 @@ class IpiDatabase(object): self._AddDp(DpObj.Header.GetGuid(), DpObj.Header.GetVersion(),= \ NewDpPkgFileName, DpPkgFileName, RePackage) =20 - except sqlite3.IntegrityError, DetailMsg: + except sqlite3.IntegrityError as DetailMsg: Logger.Error("UPT", UPT_DB_UPDATE_ERROR, ST.ERR_UPT_DB_UPDATE_ERROR, diff --git a/BaseTools/Source/Python/UPT/Core/PackageFile.py b/BaseTools/So= urce/Python/UPT/Core/PackageFile.py index ec6f5503eaad..298d8aa9db3b 100644 --- a/BaseTools/Source/Python/UPT/Core/PackageFile.py +++ b/BaseTools/Source/Python/UPT/Core/PackageFile.py @@ -51,7 +51,7 @@ class PackageFile: self._Files =3D {} for Filename in self._ZipFile.namelist(): self._Files[os.path.normpath(Filename)] =3D Filename - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_OPEN_FAILURE,=20 ExtraData=3D"%s (%s)" % (FileName, str(Xstr))) =20 @@ -106,7 +106,7 @@ class PackageFile: ExtraData=3D"[%s] in %s" % (Which, self._FileN= ame)) try: FileContent =3D self._ZipFile.read(self._Files[Which]) - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_DECOMPRESS_FAILURE,=20 ExtraData=3D"[%s] in %s (%s)" % (Which, \ self._FileName,= \ @@ -119,14 +119,14 @@ class PackageFile: return else: ToFile =3D __FileHookOpen__(ToDest, 'wb') - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_OPEN_FAILURE,=20 ExtraData=3D"%s (%s)" % (ToDest, str(Xstr))) =20 try: ToFile.write(FileContent) ToFile.close() - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_WRITE_FAILURE,=20 ExtraData=3D"%s (%s)" % (ToDest, str(Xstr))) =20 @@ -228,7 +228,7 @@ class PackageFile: return Logger.Info("packing ..." + File) self._ZipFile.write(File, ArcName) - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_COMPRESS_FAILURE, ExtraData=3D"%s (%s)" % (File, str(Xstr))) =20 @@ -242,7 +242,7 @@ class PackageFile: if os.path.splitext(ArcName)[1].lower() =3D=3D '.pkg': Data =3D Data.encode('utf_8') self._ZipFile.writestr(ArcName, Data) - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_COMPRESS_FAILURE, ExtraData=3D"%s (%s)" % (ArcName, str(Xstr))) =20 diff --git a/BaseTools/Source/Python/UPT/InstallPkg.py b/BaseTools/Source/P= ython/UPT/InstallPkg.py index c0d56b55aacd..dc22ff7e3484 100644 --- a/BaseTools/Source/Python/UPT/InstallPkg.py +++ b/BaseTools/Source/Python/UPT/InstallPkg.py @@ -537,7 +537,7 @@ def Main(Options =3D None): Options, Dep, WorkspaceDir, DataBase) ReturnCode =3D 0 =20 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode =3D XExcept.args[0] if Logger.GetLevel() <=3D Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) += format_exc()) diff --git a/BaseTools/Source/Python/UPT/InventoryWs.py b/BaseTools/Source/= Python/UPT/InventoryWs.py index 824e1c288947..cd92753a8d4b 100644 --- a/BaseTools/Source/Python/UPT/InventoryWs.py +++ b/BaseTools/Source/Python/UPT/InventoryWs.py @@ -92,7 +92,7 @@ def Main(Options =3D None): DataBase =3D GlobalData.gDB InventoryDistInstalled(DataBase) =20 ReturnCode =3D 0 =20 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode =3D XExcept.args[0] if Logger.GetLevel() <=3D Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) += format_exc()) diff --git a/BaseTools/Source/Python/UPT/Library/CommentParsing.py b/BaseTo= ols/Source/Python/UPT/Library/CommentParsing.py index 4713614c4a45..8ee788bd7724 100644 --- a/BaseTools/Source/Python/UPT/Library/CommentParsing.py +++ b/BaseTools/Source/Python/UPT/Library/CommentParsing.py @@ -217,7 +217,7 @@ def ParsePcdErrorCode (Value =3D None, ContainerFile = =3D None, LineNum =3D None): # To delete the tailing 'L' # return hex(ErrorCode)[:-1] - except ValueError, XStr: + except ValueError as XStr: if XStr: pass Logger.Error('Parser',=20 diff --git a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py b/Ba= seTools/Source/Python/UPT/Library/ExpressionValidate.py index 090c7eb95716..ca21e6995217 100644 --- a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py +++ b/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py @@ -297,7 +297,7 @@ class _LogicalExpressionParser(_ExprBase): try: if self.LogicalExpression() not in [self.ARITH, self.LOGICAL, = self.REALLOGICAL, self.STRINGITEM]: return False, ST.ERR_EXPR_LOGICAL % self.Token - except _ExprError, XExcept: + except _ExprError as XExcept: return False, XExcept.Error self.SkipWhitespace() if self.Index !=3D self.Len: @@ -327,7 +327,7 @@ class _ValidRangeExpressionParser(_ExprBase): try: if self.RangeExpression() not in [self.HEX, self.INT]: return False, ST.ERR_EXPR_RANGE % self.Token - except _ExprError, XExcept: + except _ExprError as XExcept: return False, XExcept.Error =20 self.SkipWhitespace() @@ -423,7 +423,7 @@ class _ValidListExpressionParser(_ExprBase): try: if self.ListExpression() not in [self.NUM]: return False, ST.ERR_EXPR_LIST % self.Token - except _ExprError, XExcept: + except _ExprError as XExcept: return False, XExcept.Error =20 self.SkipWhitespace() @@ -457,7 +457,7 @@ class _StringTestParser(_ExprBase): return False, ST.ERR_EXPR_EMPTY try: self.StringTest() - except _ExprError, XExcept: + except _ExprError as XExcept: return False, XExcept.Error return True, '' =20 diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTo= ols/Source/Python/UPT/Library/UniClassObject.py index 7dcf0cf6558b..299cd871444b 100644 --- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py +++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py @@ -327,9 +327,9 @@ class UniFileClassObject(object): if len(Lang) !=3D 3: try: FileIn =3D codecs.open(File.Path, mode=3D'rb', encoding=3D= 'utf_8').readlines() - except UnicodeError, Xstr: + except UnicodeError as Xstr: FileIn =3D codecs.open(File.Path, mode=3D'rb', encoding=3D= 'utf_16').readlines() - except UnicodeError, Xstr: + except UnicodeError as Xstr: FileIn =3D codecs.open(File.Path, mode=3D'rb', encoding=3D= 'utf_16_le').readlines() except: EdkLogger.Error("Unicode File Parser",=20 @@ -436,7 +436,7 @@ class UniFileClassObject(object): =20 try: FileIn =3D codecs.open(File.Path, mode=3D'rb', encoding=3D'utf= _8').readlines() - except UnicodeError, Xstr: + except UnicodeError as Xstr: FileIn =3D codecs.open(File.Path, mode=3D'rb', encoding=3D'utf= _16').readlines() except UnicodeError: FileIn =3D codecs.open(File.Path, mode=3D'rb', encoding=3D'utf= _16_le').readlines() @@ -1042,7 +1042,7 @@ class UniFileClassObject(object): ExtraData=3DFilaPath) try: FileIn =3D codecs.open(FilaPath, mode=3D'rb', encoding=3D'utf_= 8').readlines() - except UnicodeError, Xstr: + except UnicodeError as Xstr: FileIn =3D codecs.open(FilaPath, mode=3D'rb', encoding=3D'utf_= 16').readlines() except UnicodeError: FileIn =3D codecs.open(FilaPath, mode=3D'rb', encoding=3D'utf_= 16_le').readlines() diff --git a/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py b/BaseT= ools/Source/Python/UPT/Library/Xml/XmlRoutines.py index f20ae4dfa82f..1096bc5b1849 100644 --- a/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py +++ b/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py @@ -224,6 +224,6 @@ def XmlParseFile(FileName): Dom =3D xml.dom.minidom.parse(XmlFile) XmlFile.close() return Dom - except BaseException, XExcept: + except BaseException as XExcept: XmlFile.close() Logger.Error('\nUPT', PARSER_ERROR, XExcept, File=3DFileName, Rais= eError=3DTrue) diff --git a/BaseTools/Source/Python/UPT/MkPkg.py b/BaseTools/Source/Python= /UPT/MkPkg.py index ff9aa7fb117c..e7ec328a78d9 100644 --- a/BaseTools/Source/Python/UPT/MkPkg.py +++ b/BaseTools/Source/Python/UPT/MkPkg.py @@ -213,7 +213,7 @@ def Main(Options =3D None): Logger.Quiet(ST.MSG_FINISH) ReturnCode =3D 0 =20 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode =3D XExcept.args[0] =20 if Logger.GetLevel() <=3D Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % \ diff --git a/BaseTools/Source/Python/UPT/ReplacePkg.py b/BaseTools/Source/P= ython/UPT/ReplacePkg.py index efbf68a4ecc6..6f52b4f8f8e8 100644 --- a/BaseTools/Source/Python/UPT/ReplacePkg.py +++ b/BaseTools/Source/Python/UPT/ReplacePkg.py @@ -71,7 +71,7 @@ def Main(Options =3D None): InstallDp(DistPkg, DpPkgFileName, ContentZipFile, Options, Dep, Wo= rkspaceDir, DataBase) ReturnCode =3D 0 =20 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode =3D XExcept.args[0] if Logger.GetLevel() <=3D Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), diff --git a/BaseTools/Source/Python/UPT/RmPkg.py b/BaseTools/Source/Python= /UPT/RmPkg.py index ea842c11859f..6427a8f16c88 100644 --- a/BaseTools/Source/Python/UPT/RmPkg.py +++ b/BaseTools/Source/Python/UPT/RmPkg.py @@ -157,7 +157,7 @@ def Main(Options =3D None): =20 ReturnCode =3D 0 =20 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode =3D XExcept.args[0] =20 if Logger.GetLevel() <=3D Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) += \ diff --git a/BaseTools/Source/Python/UPT/TestInstall.py b/BaseTools/Source/= Python/UPT/TestInstall.py index 899cae56aa87..d8918737f907 100644 --- a/BaseTools/Source/Python/UPT/TestInstall.py +++ b/BaseTools/Source/Python/UPT/TestInstall.py @@ -68,12 +68,12 @@ def Main(Options=3DNone): else: Logger.Quiet(ST.MSG_TEST_INSTALL_FAIL) =20 - except TE.FatalError, XExcept: + except TE.FatalError as XExcept: ReturnCode =3D XExcept.args[0] if Logger.GetLevel() <=3D Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) += format_exc()) =20 - except Exception, x: + except Exception as x: ReturnCode =3D TE.CODE_ERROR Logger.Error( "\nTestInstallPkg", diff --git a/BaseTools/Source/Python/UPT/UPT.py b/BaseTools/Source/Python/U= PT/UPT.py index 09653cdce95f..2644dbed31e9 100644 --- a/BaseTools/Source/Python/UPT/UPT.py +++ b/BaseTools/Source/Python/UPT/UPT.py @@ -179,7 +179,7 @@ def Main(): =20 try: GlobalData.gWORKSPACE, GlobalData.gPACKAGE_PATH =3D GetWorkspace() - except FatalError, XExcept: + except FatalError as XExcept: if Logger.GetLevel() <=3D Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) += format_exc()) return XExcept.args[0] @@ -294,7 +294,7 @@ def Main(): return OPTION_MISSING =20 ReturnCode =3D RunModule(Opt) - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode =3D XExcept.args[0] if Logger.GetLevel() <=3D Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) += \ diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 1ed7eb1c2cf7..a001162e8e3b 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -120,7 +120,7 @@ def GetDependencyList(FileStack,SearchPathList): try: Fd =3D open(F, 'r') FileContent =3D Fd.read() - except BaseException, X: + except BaseException as X: EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=3DF = + "\n\t" + str(X)) finally: if "Fd" in dir(locals()): @@ -887,11 +887,11 @@ class DscBuildData(PlatformBuildClassObject): DatumType =3D self._DecPcds[PcdCName, TokenSpaceGuid].DatumType try: ValueList[Index] =3D ValueExpressionEx(ValueList[Index], D= atumType, self._GuidDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, Value, File=3Dse= lf.MetaFile, Line=3DLineNo, ExtraData=3D"PCD [%s.%s] Value \"%s\" " % ( TokenSpaceGuid, PcdCName, ValueList[Index]= )) - except EvaluationException, Excpt: + except EvaluationException as Excpt: if hasattr(Excpt, 'Pcd'): if Excpt.Pcd in GlobalData.gPlatformOtherPcds: EdkLogger.error('Parser', FORMAT_INVALID, "Cannot = use this PCD (%s) in an expression as" @@ -1059,7 +1059,7 @@ class DscBuildData(PlatformBuildClassObject): return PcdValue try: PcdValue =3D ValueExpressionEx(PcdValue[1:], PcdDatumType,= GuidDict)(True) - except BadExpression, Value: =20 + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Val= ue "%s", %s' % (TokenSpaceGuidCName, TokenCName, PcdValue= , Value)) elif PcdValue.startswith("L'") or PcdValue.startswith("'"): @@ -1070,7 +1070,7 @@ class DscBuildData(PlatformBuildClassObject): return PcdValue try: PcdValue =3D ValueExpressionEx(PcdValue, PcdDatumType, Gui= dDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Val= ue "%s", %s' % (TokenSpaceGuidCName, TokenCName, PcdValue= , Value)) elif PcdValue.startswith('L'): @@ -1082,7 +1082,7 @@ class DscBuildData(PlatformBuildClassObject): return PcdValue try: PcdValue =3D ValueExpressionEx(PcdValue, PcdDatumType, Gui= dDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Val= ue "%s", %s' % (TokenSpaceGuidCName, TokenCName, PcdValue= , Value)) else: @@ -1109,7 +1109,7 @@ class DscBuildData(PlatformBuildClassObject): return PcdValue try: PcdValue =3D ValueExpressionEx(PcdValue, PcdDatumType, Gui= dDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Val= ue "%s", %s' % (TokenSpaceGuidCName, TokenCName, PcdValue= , Value)) return PcdValue diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/= Source/Python/Workspace/InfBuildData.py index 836140759f21..165e03f78964 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -1121,7 +1121,7 @@ class InfBuildData(ModuleBuildClassObject): else: try: Pcd.DefaultValue =3D ValueExpressionEx(Pcd.Def= aultValue, Pcd.DatumType, _GuidDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD= [%s.%s] Value "%s", %s' %(TokenSpaceGuid, PcdRealName, Pcd.DefaultValue, V= alue), File=3Dself.MetaFile, Line=3DL= ineNo) break diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index a2ded0c845ae..a8f13d52c42d 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -1337,7 +1337,7 @@ class DscParser(MetaFileParser): self._InSubsection =3D False try: Processer[self._ItemType]() - except EvaluationException, Excpt: + except EvaluationException as Excpt: #=20 # Only catch expression evaluation error here. We need to = report # the precise number of line on which the error occurred @@ -1359,7 +1359,7 @@ class DscParser(MetaFileParser): EdkLogger.error('Parser', FORMAT_INVALID, "Invalid exp= ression: %s" % str(Excpt), File=3Dself._FileWithError, ExtraData= =3D' '.join(self._ValueList), Line=3Dself._LineIndex + 1) - except MacroException, Excpt: + except MacroException as Excpt: EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt), File=3Dself._FileWithError, ExtraData=3D' = '.join(self._ValueList), Line=3Dself._LineIndex + 1) @@ -1457,10 +1457,10 @@ class DscParser(MetaFileParser): Macros.update(GlobalData.gGlobalDefines) try: Result =3D ValueExpression(self._ValueList[1], Macros)() - except SymbolNotFound, Exc: + except SymbolNotFound as Exc: EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueLi= st[1]) Result =3D False - except WrnExpression, Excpt: + except WrnExpression as Excpt: #=20 # Catch expression evaluation warning here. We need to rep= ort # the precise number of line and return the evaluation res= ult @@ -1623,7 +1623,7 @@ class DscParser(MetaFileParser): if PcdValue and "." not in self._ValueList[0]: try: ValList[Index] =3D ValueExpression(PcdValue, self._Macros)= (True) - except WrnExpression, Value: + except WrnExpression as Value: ValList[Index] =3D Value.result except: pass @@ -2028,7 +2028,7 @@ class DecParser(MetaFileParser): try: self._GuidDict.update(self._AllPcdDict) ValueList[0] =3D ValueExpressionEx(ValueList[0], Value= List[1], self._GuidDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, Value, Extra= Data=3Dself._CurrentLine, File=3Dself.MetaFile, Line=3Dself._LineIndex + 1) # check format of default value against the datum type IsValid, Cause =3D CheckPcdDatum(ValueList[1], ValueList[0]) diff --git a/BaseTools/Source/Python/Workspace/MetaFileTable.py b/BaseTools= /Source/Python/Workspace/MetaFileTable.py index 3c8dae0e622f..d17487a4409d 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileTable.py +++ b/BaseTools/Source/Python/Workspace/MetaFileTable.py @@ -63,7 +63,7 @@ class MetaFileTable(Table): # update the timestamp in database self._FileIndexTable.SetFileTimeStamp(self.IdBase, TimeSta= mp) return False - except Exception, Exc: + except Exception as Exc: EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc)) return False return True @@ -250,7 +250,7 @@ class PackageTable(MetaFileTable): if comment.startswith("@Expression"): comment =3D comment.replace("@Expression", "", 1) expressions.append(comment.split("|")[1].strip()) - except Exception, Exc: + except Exception as Exc: ValidType =3D "" if oricomment.startswith("@ValidRange"): ValidType =3D "@ValidRange" diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sourc= e/Python/build/BuildReport.py index 324b6ff6aa76..55222c886d2d 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -649,7 +649,7 @@ class ModuleReport(object): cmd =3D ["GenFw", "--rebase", str(0), "-o", Tempfile, Defa= ultEFIfile] try: PopenObject =3D subprocess.Popen(' '.join(cmd), stdout= =3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell=3DTrue) - except Exception, X: + except Exception as X: EdkLogger.error("GenFw", COMMAND_FAILURE, ExtraData=3D= "%s: %s" % (str(X), cmd[0])) EndOfProcedure =3D threading.Event() EndOfProcedure.clear() @@ -962,7 +962,7 @@ class PcdReport(object): if DscDefaultValue !=3D DscDefaultValBak: try: DscDefaultValue =3D ValueExpressionEx(DscDefaultVa= lue, Pcd.DatumType, self._GuidDict)(True) - except BadExpression, DscDefaultValue: + except BadExpression as DscDefaultValue: EdkLogger.error('BuildReport', FORMAT_INVALID, "PC= D Value: %s, Type: %s" %(DscDefaultValue, Pcd.DatumType)) =20 InfDefaultValue =3D None diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index c16e810fed71..4600c46be1be 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -548,7 +548,7 @@ class BuildTask: EdkLogger.debug(EdkLogger.DEBUG_8, "Threads [%s]" % ", ".j= oin(Th.getName() for Th in threading.enumerate())) # avoid tense loop time.sleep(0.1) - except BaseException, X: + except BaseException as X: # # TRICK: hide the output of threads left runing, so that the u= ser can # catch the error message easily @@ -1324,7 +1324,7 @@ class Build(): try: #os.rmdir(AutoGenObject.BuildDir) RemoveDirectory(AutoGenObject.BuildDir, True) - except WindowsError, X: + except WindowsError as X: EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=3D= str(X)) return True =20 @@ -1414,7 +1414,7 @@ class Build(): try: #os.rmdir(AutoGenObject.BuildDir) RemoveDirectory(AutoGenObject.BuildDir, True) - except WindowsError, X: + except WindowsError as X: EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=3D= str(X)) return True =20 @@ -2500,14 +2500,14 @@ def Main(): # All job done, no error found and no exception raised # BuildError =3D False - except FatalError, X: + except FatalError as X: if MyBuild is not None: # for multi-thread build exits safely MyBuild.Relinquish() if Option is not None and Option.debug is not None: EdkLogger.quiet("(Python %s on %s) " % (platform.python_versio= n(), sys.platform) + traceback.format_exc()) ReturnCode =3D X.args[0] - except Warning, X: + except Warning as X: # error from Fdf parser if MyBuild is not None: # for multi-thread build exits safely diff --git a/BaseTools/Tests/CheckPythonSyntax.py b/BaseTools/Tests/CheckPy= thonSyntax.py index 61a048ad5d05..a55b29de4713 100644 --- a/BaseTools/Tests/CheckPythonSyntax.py +++ b/BaseTools/Tests/CheckPythonSyntax.py @@ -29,7 +29,7 @@ class Tests(TestTools.BaseToolsTest): def SingleFileTest(self, filename): try: py_compile.compile(filename, doraise=3DTrue) - except Exception, e: + except Exception as e: self.fail('syntax error: %s, Error is %s' % (filename, str(e))) =20 def MakePythonSyntaxCheckTests(): diff --git a/BaseTools/gcc/mingw-gcc-build.py b/BaseTools/gcc/mingw-gcc-bui= ld.py index 420b3dea80f7..858b4020ef9f 100755 --- a/BaseTools/gcc/mingw-gcc-build.py +++ b/BaseTools/gcc/mingw-gcc-build.py @@ -337,7 +337,7 @@ class SourceFiles: print '[KeyboardInterrupt]' return False =20 - except Exception, e: + except Exception as e: print e =20 if not completed: return False --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556268236813.037912794459; Wed, 20 Jun 2018 21:44:28 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 065F1211D5062; Wed, 20 Jun 2018 21:44:23 -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 D1ED7211D505F for ; Wed, 20 Jun 2018 21:44:20 -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:17 +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:29 +0800 Message-Id: <20180621044346.28495-4-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 03/20] BaseTools: Refactor python print statements 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" Refactor print statements to be compatible with python 3. Based on "futurize -f libfuturize.fixes.fix_print_with_import" 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 = | 3 +- BaseTools/Scripts/BinToPcd.py = | 1 + BaseTools/Scripts/FormatDosFiles.py = | 1 + BaseTools/Scripts/MemoryProfileSymbolGen.py = | 13 +-- BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py = | 47 +++++----- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxyge= n.py | 3 +- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/efibin= ary.py | 29 +++--- BaseTools/Scripts/SmiHandlerProfileSymbolGen.py = | 19 ++-- BaseTools/Source/Python/AutoGen/AutoGen.py = | 5 +- BaseTools/Source/Python/AutoGen/BuildEngine.py = | 31 +++--- BaseTools/Source/Python/AutoGen/UniClassObject.py = | 7 +- BaseTools/Source/Python/BPDG/BPDG.py = | 3 +- BaseTools/Source/Python/Common/Expression.py = | 11 ++- BaseTools/Source/Python/Common/RangeExpression.py = | 5 +- BaseTools/Source/Python/Common/TargetTxtClassObject.py = | 7 +- BaseTools/Source/Python/Common/VpdInfoFile.py = | 3 +- BaseTools/Source/Python/Ecc/CParser.py = | 3 +- BaseTools/Source/Python/Ecc/CodeFragmentCollector.py = | 69 +++++++------- BaseTools/Source/Python/Ecc/Configuration.py = | 5 +- BaseTools/Source/Python/Ecc/Exception.py = | 3 +- BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py = | 3 +- BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py = | 5 +- BaseTools/Source/Python/Ecc/c.py = | 13 +-- BaseTools/Source/Python/Eot/CParser.py = | 3 +- BaseTools/Source/Python/Eot/CodeFragmentCollector.py = | 61 ++++++------ BaseTools/Source/Python/Eot/InfParserLite.py = | 7 +- BaseTools/Source/Python/Eot/c.py = | 3 +- BaseTools/Source/Python/GenFds/FdfParser.py = | 7 +- BaseTools/Source/Python/GenFds/GenFds.py = | 3 +- BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py = | 3 +- BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py = | 7 +- BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py = | 23 ++--- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py = | 15 +-- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py = | 17 ++-- BaseTools/Source/Python/TargetTool/TargetTool.py = | 23 ++--- BaseTools/Source/Python/UPT/Library/ExpressionValidate.py = | 3 +- BaseTools/Source/Python/UPT/Library/UniClassObject.py = | 9 +- BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py = | 51 +++++----- BaseTools/Source/Python/UPT/UnitTest/DecParserTest.py = | 5 +- BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py = | 9 +- BaseTools/Source/Python/Workspace/DscBuildData.py = | 5 +- BaseTools/Source/Python/Workspace/MetaFileParser.py = | 3 +- BaseTools/Source/Python/build/build.py = | 3 +- BaseTools/Tests/TestTools.py = | 5 +- BaseTools/Tests/TianoCompress.py = | 5 +- BaseTools/gcc/mingw-gcc-build.py = | 99 ++++++++++---------- 46 files changed, 352 insertions(+), 306 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 69fd2d54413e..dd66c7111ac0 100755 --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/armcc_wrapper.py @@ -23,6 +23,7 @@ # # ExceptionList if a tool takes an argument with a / add it to the excepti= on list # +from __future__ import print_function import sys import os import subprocess @@ -86,7 +87,7 @@ if __name__ =3D=3D "__main__": ret =3D main(sys.argv[2:]) =20 except: - print "exiting: exception from " + sys.argv[0] + print("exiting: exception from " + sys.argv[0]) ret =3D 2 =20 sys.exit(ret) diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py index b907d3e5e000..10b5043325cc 100644 --- a/BaseTools/Scripts/BinToPcd.py +++ b/BaseTools/Scripts/BinToPcd.py @@ -14,6 +14,7 @@ ''' BinToPcd ''' +from __future__ import print_function =20 import sys import argparse diff --git a/BaseTools/Scripts/FormatDosFiles.py b/BaseTools/Scripts/Format= DosFiles.py index 2f2d4d532c76..3b16af5a4413 100644 --- a/BaseTools/Scripts/FormatDosFiles.py +++ b/BaseTools/Scripts/FormatDosFiles.py @@ -16,6 +16,7 @@ # # Import Modules # +from __future__ import print_function import argparse import os import os.path diff --git a/BaseTools/Scripts/MemoryProfileSymbolGen.py b/BaseTools/Script= s/MemoryProfileSymbolGen.py index 5709ad4641cb..0a41f9d83271 100644 --- a/BaseTools/Scripts/MemoryProfileSymbolGen.py +++ b/BaseTools/Scripts/MemoryProfileSymbolGen.py @@ -14,6 +14,7 @@ # ## =20 +from __future__ import print_function import os import re import sys @@ -58,10 +59,10 @@ class Symbols: try: nmCommand =3D "nm" nmLineOption =3D "-l" - print "parsing (debug) - " + pdbName + print("parsing (debug) - " + pdbName) os.system ('%s %s %s > nmDump.line.log' % (nmCommand, nmLineOp= tion, pdbName)) except : - print 'ERROR: nm command not available. Please verify PATH' + print('ERROR: nm command not available. Please verify PATH') return =20 # @@ -111,11 +112,11 @@ class Symbols: DIA2DumpCommand =3D "Dia2Dump.exe" #DIA2SymbolOption =3D "-p" DIA2LinesOption =3D "-l" - print "parsing (pdb) - " + pdbName + print("parsing (pdb) - " + pdbName) #os.system ('%s %s %s > DIA2Dump.symbol.log' % (DIA2DumpComman= d, DIA2SymbolOption, pdbName)) os.system ('%s %s %s > DIA2Dump.line.log' % (DIA2DumpCommand, = DIA2LinesOption, pdbName)) except : - print 'ERROR: DIA2Dump command not available. Please verify P= ATH' + print('ERROR: DIA2Dump command not available. Please verify P= ATH') return =20 # @@ -254,12 +255,12 @@ def main(): try : file =3D open(Options.inputfilename) except Exception: - print "fail to open " + Options.inputfilename + print("fail to open " + Options.inputfilename) return 1 try : newfile =3D open(Options.outputfilename, "w") except Exception: - print "fail to open " + Options.outputfilename + print("fail to open " + Options.outputfilename) return 1 =20 try: diff --git a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py b/Bas= eTools/Scripts/PackageDocumentTools/packagedoc_cli.py index 557ffa4505e4..4deeee01a5e8 100644 --- a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py +++ b/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py @@ -12,6 +12,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from __future__ import print_function import os, sys, logging, traceback, subprocess from optparse import OptionParser =20 @@ -62,7 +63,7 @@ def parseCmdArgs(): default =3D "C:\\Program Files\\doxygen\\bin\\doxygen.exe" if options.DoxygenPath is None: if os.path.exists(default): - print "Warning: Assume doxygen tool is installed at %s. If not= , please specify via -x" % default + print("Warning: Assume doxygen tool is installed at %s. If not= , please specify via -x" % default) options.DoxygenPath =3D default else: errors.append('- Please specify the path of doxygen tool insta= llation via option -x! or install it in default path %s' % default) @@ -80,7 +81,7 @@ def parseCmdArgs(): if options.PackagePath is not None and os.path.exists(options.Pack= agePath): dirpath =3D os.path.dirname(options.PackagePath) default =3D os.path.join (dirpath, "Document") - print 'Warning: Assume document output at %s. If not, please s= pecify via option -o' % default + print('Warning: Assume document output at %s. If not, please s= pecify via option -o' % default) options.OutputPath =3D default if not os.path.exists(default): try: @@ -92,21 +93,21 @@ def parseCmdArgs(): =20 if options.Arch is None: options.Arch =3D 'ALL' - print "Warning: Assume arch is \"ALL\". If not, specify via -a" + print("Warning: Assume arch is \"ALL\". If not, specify via -a") =20 if options.DocumentMode is None: options.DocumentMode =3D "HTML" - print "Warning: Assume document mode is \"HTML\". If not, specify = via -m" + print("Warning: Assume document mode is \"HTML\". If not, specify = via -m") =20 if options.IncludeOnly is None: options.IncludeOnly =3D False - print "Warning: Assume generate package document for all package\'= s source including publich interfaces and implementation libraries and modu= les." + print("Warning: Assume generate package document for all package\'= s source including publich interfaces and implementation libraries and modu= les.") =20 if options.DocumentMode.lower() =3D=3D 'chm': default =3D "C:\\Program Files\\HTML Help Workshop\\hhc.exe" if options.HtmlWorkshopPath is None: if os.path.exists(default): - print 'Warning: Assume the installation path of Microsoft = HTML Workshop is %s. If not, specify via option -c.' % default + print('Warning: Assume the installation path of Microsoft = HTML Workshop is %s. If not, specify via option -c.' % default) options.HtmlWorkshopPath =3D default else: errors.append('- Please specify the installation path of M= icrosoft HTML Workshop via option -c!') @@ -114,7 +115,7 @@ def parseCmdArgs(): errors.append('- The installation path of Microsoft HTML Works= hop %s does not exists. ' % options.HtmlWorkshopPath) =20 if len(errors) !=3D 0: - print '\n' + print('\n') parser.error('Fail to start due to following reasons: \n%s' %'\n'.= join(errors)) return (options.WorkspacePath, options.PackagePath, options.DoxygenPat= h, options.OutputPath, options.Arch, options.DocumentMode, options.IncludeOnly, optio= ns.HtmlWorkshopPath) @@ -130,21 +131,21 @@ def createPackageObject(wsPath, pkgPath): return pkgObj =20 def callbackLogMessage(msg, level): - print msg.strip() + print(msg.strip()) =20 def callbackCreateDoxygenProcess(doxPath, configPath): if sys.platform =3D=3D 'win32': cmd =3D '"%s" %s' % (doxPath, configPath) else: cmd =3D '%s %s' % (doxPath, configPath) - print cmd + print(cmd) subprocess.call(cmd, shell=3DTrue) =20 =20 def DocumentFixup(outPath, arch): # find BASE_LIBRARY_JUMP_BUFFER structure reference page =20 - print '\n >>> Start fixup document \n' + print('\n >>> Start fixup document \n') =20 for root, dirs, files in os.walk(outPath): for dir in dirs: @@ -172,10 +173,10 @@ def DocumentFixup(outPath, arch): if text.find('MdePkg/Include/Library/UefiApplicationEntryPoint= .h File Reference') !=3D -1: FixPageUefiApplicationEntryPoint(fullpath, text) =20 - print ' >>> Finish all document fixing up! \n' + print(' >>> Finish all document fixing up! \n') =20 def FixPageBaseLib(path, text): - print ' >>> Fixup BaseLib file page at file %s \n' % path + print(' >>> Fixup BaseLib file page at file %s \n' % path) lines =3D text.split('\n') lastBaseJumpIndex =3D -1 lastIdtGateDescriptor =3D -1 @@ -211,10 +212,10 @@ def FixPageBaseLib(path, text): except: logging.getLogger().error(" <<< Fail to fixup file %s\n" % pat= h) return - print " <<< Finish to fixup file %s\n" % path + print(" <<< Finish to fixup file %s\n" % path) =20 def FixPageIA32_IDT_GATE_DESCRIPTOR(path, text): - print ' >>> Fixup structure reference IA32_IDT_GATE_DESCRIPTOR at f= ile %s \n' % path + print(' >>> Fixup structure reference IA32_IDT_GATE_DESCRIPTOR at f= ile %s \n' % path) lines =3D text.split('\n') for index in range(len(lines) - 1, -1, -1): line =3D lines[index].strip() @@ -229,10 +230,10 @@ def FixPageIA32_IDT_GATE_DESCRIPTOR(path, text): except: logging.getLogger().error(" <<< Fail to fixup file %s\n" % pat= h) return - print " <<< Finish to fixup file %s\n" % path + print(" <<< Finish to fixup file %s\n" % path) =20 def FixPageBASE_LIBRARY_JUMP_BUFFER(path, text): - print ' >>> Fixup structure reference BASE_LIBRARY_JUMP_BUFFER at f= ile %s \n' % path + print(' >>> Fixup structure reference BASE_LIBRARY_JUMP_BUFFER at f= ile %s \n' % path) lines =3D text.split('\n') bInDetail =3D True bNeedRemove =3D False @@ -266,10 +267,10 @@ def FixPageBASE_LIBRARY_JUMP_BUFFER(path, text): except: logging.getLogger().error(" <<< Fail to fixup file %s" % path) return - print " <<< Finish to fixup file %s\n" % path + print(" <<< Finish to fixup file %s\n" % path) =20 def FixPageUefiDriverEntryPoint(path, text): - print ' >>> Fixup file reference MdePkg/Include/Library/UefiDriverE= ntryPoint.h at file %s \n' % path + print(' >>> Fixup file reference MdePkg/Include/Library/UefiDriverE= ntryPoint.h at file %s \n' % path) lines =3D text.split('\n') bInModuleEntry =3D False bInEfiMain =3D False @@ -318,11 +319,11 @@ def FixPageUefiDriverEntryPoint(path, text): except: logging.getLogger().error(" <<< Fail to fixup file %s" % path) return - print " <<< Finish to fixup file %s\n" % path + print(" <<< Finish to fixup file %s\n" % path) =20 =20 def FixPageUefiApplicationEntryPoint(path, text): - print ' >>> Fixup file reference MdePkg/Include/Library/UefiApplica= tionEntryPoint.h at file %s \n' % path + print(' >>> Fixup file reference MdePkg/Include/Library/UefiApplica= tionEntryPoint.h at file %s \n' % path) lines =3D text.split('\n') bInModuleEntry =3D False bInEfiMain =3D False @@ -371,7 +372,7 @@ def FixPageUefiApplicationEntryPoint(path, text): except: logging.getLogger().error(" <<< Fail to fixup file %s" % path) return - print " <<< Finish to fixup file %s\n" % path + print(" <<< Finish to fixup file %s\n" % path) =20 if __name__ =3D=3D '__main__': wspath, pkgpath, doxpath, outpath, archtag, docmode, isinc, hwpath =3D= parseCmdArgs() @@ -424,6 +425,6 @@ if __name__ =3D=3D '__main__': else: cmd =3D '%s %s' % (hwpath, indexpath) subprocess.call(cmd) - print '\nFinish to generate package document! Please open %s for r= eview' % os.path.join(outpath, 'html', 'index.chm') + print('\nFinish to generate package document! Please open %s for r= eview' % os.path.join(outpath, 'html', 'index.chm')) else: - print '\nFinish to generate package document! Please open %s for r= eview' % os.path.join(outpath, 'html', 'index.html') + print('\nFinish to generate package document! Please open %s for r= eview' % os.path.join(outpath, 'html', 'index.html')) diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/doxygen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugin= s/basemodel/doxygen.py index a177590af597..fe2ba1d8a842 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/d= oxygen.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/d= oxygen.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from __future__ import print_function import os =20 from message import * @@ -446,4 +447,4 @@ if __name__=3D=3D '__main__': p.AddPage(Page('PCD', 'pcds')) =20 df.Generate() - print df + print(df) diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/efibinary.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlug= ins/basemodel/efibinary.py index 9db16a63c07a..290287b817e7 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/e= fibinary.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/e= fibinary.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from __future__ import print_function import array import uuid import re @@ -250,12 +251,12 @@ class EfiFirmwareVolumeHeader(BinaryItem): return list2int(self._arr.tolist()[48:50]) =20 def Dump(self): - print 'Signature: %s' % self.GetSigunature() - print 'Attribute: 0x%X' % self.GetAttribute() - print 'Header Length: 0x%X' % self.GetHeaderLength() - print 'File system Guid: ', self.GetFileSystemGuid() - print 'Revision: 0x%X' % self.GetRevision() - print 'FvLength: 0x%X' % self.GetFvLength() + print('Signature: %s' % self.GetSigunature()) + print('Attribute: 0x%X' % self.GetAttribute()) + print('Header Length: 0x%X' % self.GetHeaderLength()) + print('File system Guid: ', self.GetFileSystemGuid()) + print('Revision: 0x%X' % self.GetRevision()) + print('FvLength: 0x%X' % self.GetFvLength()) =20 def GetFileSystemGuid(self): list =3D self._arr.tolist() @@ -348,7 +349,7 @@ class EfiFfs(object): line.append('0x%X' % int(item)) count +=3D 1 else: - print ' '.join(line) + print(' '.join(line)) count =3D 0 line =3D [] line.append('0x%X' % int(item)) @@ -445,11 +446,11 @@ class EfiFfsHeader(BinaryItem): return 'Unknown Ffs State' =20 def Dump(self): - print "FFS name: ", self.GetNameGuid() - print "FFS type: ", self.GetType() - print "FFS attr: 0x%X" % self.GetAttributes() - print "FFS size: 0x%X" % self.GetFfsSize() - print "FFS state: 0x%X" % self.GetState() + print("FFS name: ", self.GetNameGuid()) + print("FFS type: ", self.GetType()) + print("FFS attr: 0x%X" % self.GetAttributes()) + print("FFS size: 0x%X" % self.GetFfsSize()) + print("FFS state: 0x%X" % self.GetState()) =20 def GetRawData(self): return self._arr.tolist() @@ -528,8 +529,8 @@ class EfiSectionHeader(BinaryItem): return self.section_type_map[type] =20 def Dump(self): - print 'size =3D 0x%X' % self.GetSectionSize() - print 'type =3D 0x%X' % self.GetType() + print('size =3D 0x%X' % self.GetSectionSize()) + print('type =3D 0x%X' % self.GetType()) =20 =20 =20 diff --git a/BaseTools/Scripts/SmiHandlerProfileSymbolGen.py b/BaseTools/Sc= ripts/SmiHandlerProfileSymbolGen.py index 26c092410386..8ad5d471d052 100644 --- a/BaseTools/Scripts/SmiHandlerProfileSymbolGen.py +++ b/BaseTools/Scripts/SmiHandlerProfileSymbolGen.py @@ -14,6 +14,7 @@ # ## =20 +from __future__ import print_function import os import re import sys @@ -61,10 +62,10 @@ class Symbols: try: nmCommand =3D "nm" nmLineOption =3D "-l" - print "parsing (debug) - " + pdbName + print("parsing (debug) - " + pdbName) os.system ('%s %s %s > nmDump.line.log' % (nmCommand, nmLineOp= tion, pdbName)) except : - print 'ERROR: nm command not available. Please verify PATH' + print('ERROR: nm command not available. Please verify PATH') return =20 # @@ -103,11 +104,11 @@ class Symbols: DIA2DumpCommand =3D "Dia2Dump.exe" #DIA2SymbolOption =3D "-p" DIA2LinesOption =3D "-l" - print "parsing (pdb) - " + pdbName + print("parsing (pdb) - " + pdbName) #os.system ('%s %s %s > DIA2Dump.symbol.log' % (DIA2DumpComman= d, DIA2SymbolOption, pdbName)) os.system ('%s %s %s > DIA2Dump.line.log' % (DIA2DumpCommand, = DIA2LinesOption, pdbName)) except : - print 'ERROR: DIA2Dump command not available. Please verify P= ATH' + print('ERROR: DIA2Dump command not available. Please verify P= ATH') return =20 # @@ -235,14 +236,14 @@ def main(): try : DOMTree =3D xml.dom.minidom.parse(Options.inputfilename) except Exception: - print "fail to open input " + Options.inputfilename + print("fail to open input " + Options.inputfilename) return 1 =20 if Options.guidreffilename is not None: try : guidreffile =3D open(Options.guidreffilename) except Exception: - print "fail to open guidref" + Options.guidreffilename + print("fail to open guidref" + Options.guidreffilename) return 1 genGuidString(guidreffile) guidreffile.close() @@ -277,7 +278,7 @@ def main(): =20 Handler =3D smiHandler.getElementsByTagName("Handler") RVA =3D Handler[0].getElementsByTagName("RVA") - print " Handler RVA: %s" % RVA[0].childNodes[0].data + print(" Handler RVA: %s" % RVA[0].childNodes[0].dat= a) =20 if (len(RVA)) >=3D 1: rvaName =3D RVA[0].childNodes[0].data @@ -289,7 +290,7 @@ def main(): =20 Caller =3D smiHandler.getElementsByTagName("Caller") RVA =3D Caller[0].getElementsByTagName("RVA") - print " Caller RVA: %s" % RVA[0].childNodes[0].data + print(" Caller RVA: %s" % RVA[0].childNodes[0].data) =20 if (len(RVA)) >=3D 1: rvaName =3D RVA[0].childNodes[0].data @@ -302,7 +303,7 @@ def main(): try : newfile =3D open(Options.outputfilename, "w") except Exception: - print "fail to open output" + Options.outputfilename + print("fail to open output" + Options.outputfilename) return 1 =20 newfile.write(DOMTree.toprettyxml(indent =3D "\t", newl =3D "\n", enco= ding =3D "utf-8")) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index 72d801df8fd5..e268c4c0a1cf 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -15,6 +15,7 @@ =20 ## Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os import re import os.path as path @@ -688,7 +689,7 @@ class WorkspaceAutoGen(AutoGen): os.makedirs(self.BuildDir) with open(os.path.join(self.BuildDir, 'AutoGen'), 'w+') as file: for f in AllWorkSpaceMetaFiles: - print >> file, f + print(f, file=3Dfile) return True =20 def _GenPkgLevelHash(self, Pkg): @@ -4362,7 +4363,7 @@ class ModuleAutoGen(AutoGen): os.remove (self.GetTimeStampPath()) with open(self.GetTimeStampPath(), 'w+') as file: for f in FileSet: - print >> file, f + print(f, file=3Dfile) =20 Module =3D property(_GetModule) Name =3D property(_GetBaseName) diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Sou= rce/Python/AutoGen/BuildEngine.py index ad1919442e6e..d4daa3093761 100644 --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py @@ -14,6 +14,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os import re import copy @@ -597,19 +598,19 @@ if __name__ =3D=3D '__main__': EdkLogger.Initialize() if len(sys.argv) > 1: Br =3D BuildRule(sys.argv[1]) - print str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "MSFT"][1]) - print - print str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "INTEL"][1]) - print - print str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "GCC"][1]) - print - print str(Br[".ac", "ACPI_TABLE", "IA32", "MSFT"][1]) - print - print str(Br[".h", "ACPI_TABLE", "IA32", "INTEL"][1]) - print - print str(Br[".ac", "ACPI_TABLE", "IA32", "MSFT"][1]) - print - print str(Br[".s", SUP_MODULE_SEC, "IPF", "COMMON"][1]) - print - print str(Br[".s", SUP_MODULE_SEC][1]) + print(str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "MSFT"][1])) + print() + print(str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "INTEL"][1])) + print() + print(str(Br[".c", SUP_MODULE_DXE_DRIVER, "IA32", "GCC"][1])) + print() + print(str(Br[".ac", "ACPI_TABLE", "IA32", "MSFT"][1])) + print() + print(str(Br[".h", "ACPI_TABLE", "IA32", "INTEL"][1])) + print() + print(str(Br[".ac", "ACPI_TABLE", "IA32", "MSFT"][1])) + print() + print(str(Br[".s", SUP_MODULE_SEC, "IPF", "COMMON"][1])) + print() + print(str(Br[".s", SUP_MODULE_SEC][1])) =20 diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/= Source/Python/AutoGen/UniClassObject.py index 06cf3e7d5162..3a931c6f2766 100644 --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py @@ -16,6 +16,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os, codecs, re import distutils.util import Common.EdkLogger as EdkLogger @@ -684,12 +685,12 @@ class UniFileClassObject(object): # Show the instance itself # def ShowMe(self): - print self.LanguageDef + print(self.LanguageDef) #print self.OrderedStringList for Item in self.OrderedStringList: - print Item + print(Item) for Member in self.OrderedStringList[Item]: - print str(Member) + print(str(Member)) =20 # This acts like the main() function for the script, unless it is 'import'= ed into another # script. diff --git a/BaseTools/Source/Python/BPDG/BPDG.py b/BaseTools/Source/Python= /BPDG/BPDG.py index 6c8f89f5d12b..86c44abb67a6 100644 --- a/BaseTools/Source/Python/BPDG/BPDG.py +++ b/BaseTools/Source/Python/BPDG/BPDG.py @@ -20,6 +20,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os import sys import encodings.ascii @@ -132,7 +133,7 @@ def MyOptionParser(): # def StartBpdg(InputFileName, MapFileName, VpdFileName, Force): if os.path.exists(VpdFileName) and not Force: - print "\nFile %s already exist, Overwrite(Yes/No)?[Y]: " % VpdFile= Name + print("\nFile %s already exist, Overwrite(Yes/No)?[Y]: " % VpdFile= Name) choice =3D sys.stdin.readline() if choice.strip().lower() not in ['y', 'yes', '']: return diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Sourc= e/Python/Common/Expression.py index 7b04dcdb36cc..c63030a16e6e 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -12,6 +12,7 @@ =20 ## Import Modules # +from __future__ import print_function from Common.GlobalData import * from CommonDataClass.Exceptions import BadExpression from CommonDataClass.Exceptions import WrnExpression @@ -1028,10 +1029,10 @@ if __name__ =3D=3D '__main__': if input in 'qQ': break try: - print ValueExpression(input)(True) - print ValueExpression(input)(False) + print(ValueExpression(input)(True)) + print(ValueExpression(input)(False)) except WrnExpression as Ex: - print Ex.result - print str(Ex) + print(Ex.result) + print(str(Ex)) except Exception as Ex: - print str(Ex) + print(str(Ex)) diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/= Source/Python/Common/RangeExpression.py index b6f99447057c..4c29bc9ee4bd 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -12,6 +12,7 @@ =20 # # Import Modules # +from __future__ import print_function from Common.GlobalData import * from CommonDataClass.Exceptions import BadExpression from CommonDataClass.Exceptions import WrnExpression @@ -85,11 +86,11 @@ class RangeContainer(object): self.__clean__() =20 def dump(self): - print "----------------------" + print("----------------------") rangelist =3D "" for object in self.rangelist: rangelist =3D rangelist + "[%d , %d]" % (object.start, object.= end) - print rangelist + print(rangelist) =20 =20 class XOROperatorObject(object): =20 diff --git a/BaseTools/Source/Python/Common/TargetTxtClassObject.py b/BaseT= ools/Source/Python/Common/TargetTxtClassObject.py index f8459c892e36..8ba8dd31a8c5 100644 --- a/BaseTools/Source/Python/Common/TargetTxtClassObject.py +++ b/BaseTools/Source/Python/Common/TargetTxtClassObject.py @@ -14,6 +14,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os import EdkLogger import DataType @@ -158,6 +159,6 @@ def TargetTxtDict(ConfDir): if __name__ =3D=3D '__main__': pass Target =3D TargetTxtDict(os.getenv("WORKSPACE")) - print Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRE= NT_THREAD_NUMBER] - print Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET] - print Target.TargetTxtDictionary + print(Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRE= NT_THREAD_NUMBER]) + print(Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET]) + print(Target.TargetTxtDictionary) diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Sour= ce/Python/Common/VpdInfoFile.py index 8ff544ed769d..09b8196faf07 100644 --- a/BaseTools/Source/Python/Common/VpdInfoFile.py +++ b/BaseTools/Source/Python/Common/VpdInfoFile.py @@ -15,6 +15,7 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # +from __future__ import print_function import Common.LongFilePathOs as os import re import Common.EdkLogger as EdkLogger @@ -248,7 +249,7 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName): except Exception as X: EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, ExtraData= =3Dstr(X)) (out, error) =3D PopenObject.communicate() - print out + print(out) while PopenObject.returncode is None : PopenObject.wait() =20 diff --git a/BaseTools/Source/Python/Ecc/CParser.py b/BaseTools/Source/Pyth= on/Ecc/CParser.py index ddc6cbd506aa..80cf278cf87c 100644 --- a/BaseTools/Source/Python/Ecc/CParser.py +++ b/BaseTools/Source/Python/Ecc/CParser.py @@ -1,5 +1,6 @@ # $ANTLR 3.0.1 C.g 2010-02-23 09:58:53 =20 +from __future__ import print_function from antlr3 import * from antlr3.compat import set, frozenset =20 @@ -102,7 +103,7 @@ class CParser(Parser): self.postfix_expression_stack =3D [] =20 def printTokenInfo(self, line, offset, tokenText): - print str(line)+ ',' + str(offset) + ':' + str(tokenText) + print(str(line)+ ',' + str(offset) + ':' + str(tokenText)) =20 def StorePredicateExpression(self, StartLine, StartOffset, EndLine, En= dOffset, Text): PredExp =3D CodeFragment.PredicateExpression(Text, (StartLine, StartO= ffset), (EndLine, EndOffset)) diff --git a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py b/BaseToo= ls/Source/Python/Ecc/CodeFragmentCollector.py index ffa51de7c1bf..2efae2c7c1de 100644 --- a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py +++ b/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py @@ -16,6 +16,7 @@ # Import Modules # =20 +from __future__ import print_function import re import Common.LongFilePathOs as os import sys @@ -533,58 +534,58 @@ class CodeFragmentCollector: =20 def PrintFragments(self): =20 - print '################# ' + self.FileName + '####################= #' + print('################# ' + self.FileName + '####################= #') =20 - print '/****************************************/' - print '/*************** COMMENTS ***************/' - print '/****************************************/' + print('/****************************************/') + print('/*************** COMMENTS ***************/') + print('/****************************************/') for comment in FileProfile.CommentList: - print str(comment.StartPos) + comment.Content + print(str(comment.StartPos) + comment.Content) =20 - print '/****************************************/' - print '/********* PREPROCESS DIRECTIVES ********/' - print '/****************************************/' + print('/****************************************/') + print('/********* PREPROCESS DIRECTIVES ********/') + print('/****************************************/') for pp in FileProfile.PPDirectiveList: - print str(pp.StartPos) + pp.Content + print(str(pp.StartPos) + pp.Content) =20 - print '/****************************************/' - print '/********* VARIABLE DECLARATIONS ********/' - print '/****************************************/' + print('/****************************************/') + print('/********* VARIABLE DECLARATIONS ********/') + print('/****************************************/') for var in FileProfile.VariableDeclarationList: - print str(var.StartPos) + var.Modifier + ' '+ var.Declarator + print(str(var.StartPos) + var.Modifier + ' '+ var.Declarator) =20 - print '/****************************************/' - print '/********* FUNCTION DEFINITIONS *********/' - print '/****************************************/' + print('/****************************************/') + print('/********* FUNCTION DEFINITIONS *********/') + print('/****************************************/') for func in FileProfile.FunctionDefinitionList: - print str(func.StartPos) + func.Modifier + ' '+ func.Declarato= r + ' ' + str(func.NamePos) + print(str(func.StartPos) + func.Modifier + ' '+ func.Declarato= r + ' ' + str(func.NamePos)) =20 - print '/****************************************/' - print '/************ ENUMERATIONS **************/' - print '/****************************************/' + print('/****************************************/') + print('/************ ENUMERATIONS **************/') + print('/****************************************/') for enum in FileProfile.EnumerationDefinitionList: - print str(enum.StartPos) + enum.Content + print(str(enum.StartPos) + enum.Content) =20 - print '/****************************************/' - print '/*********** STRUCTS/UNIONS *************/' - print '/****************************************/' + print('/****************************************/') + print('/*********** STRUCTS/UNIONS *************/') + print('/****************************************/') for su in FileProfile.StructUnionDefinitionList: - print str(su.StartPos) + su.Content + print(str(su.StartPos) + su.Content) =20 - print '/****************************************/' - print '/********* PREDICATE EXPRESSIONS ********/' - print '/****************************************/' + print('/****************************************/') + print('/********* PREDICATE EXPRESSIONS ********/') + print('/****************************************/') for predexp in FileProfile.PredicateExpressionList: - print str(predexp.StartPos) + predexp.Content + print(str(predexp.StartPos) + predexp.Content) =20 - print '/****************************************/' =20 - print '/************** TYPEDEFS ****************/' - print '/****************************************/' + print('/****************************************/') + print('/************** TYPEDEFS ****************/') + print('/****************************************/') for typedef in FileProfile.TypedefDefinitionList: - print str(typedef.StartPos) + typedef.ToType + print(str(typedef.StartPos) + typedef.ToType) =20 if __name__ =3D=3D "__main__": =20 collector =3D CodeFragmentCollector(sys.argv[1]) collector.PreprocessFile() - print "For Test." + print("For Test.") diff --git a/BaseTools/Source/Python/Ecc/Configuration.py b/BaseTools/Sourc= e/Python/Ecc/Configuration.py index 217b60f4f319..4711bbd54fdc 100644 --- a/BaseTools/Source/Python/Ecc/Configuration.py +++ b/BaseTools/Source/Python/Ecc/Configuration.py @@ -14,6 +14,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os import Common.EdkLogger as EdkLogger from Common.DataType import * @@ -419,9 +420,9 @@ class Configuration(object): self.__dict__[_ConfigFileToInternalTranslation[List[0]]] = =3D List[1] =20 def ShowMe(self): - print self.Filename + print(self.Filename) for Key in self.__dict__.keys(): - print Key, '=3D', self.__dict__[Key] + print(Key, '=3D', self.__dict__[Key]) =20 # # test that our dict and out class still match in contents. diff --git a/BaseTools/Source/Python/Ecc/Exception.py b/BaseTools/Source/Py= thon/Ecc/Exception.py index b0882afa6289..bde41c3a4b57 100644 --- a/BaseTools/Source/Python/Ecc/Exception.py +++ b/BaseTools/Source/Python/Ecc/Exception.py @@ -14,6 +14,7 @@ ## # Import Modules # +from __future__ import print_function from Xml.XmlRoutines import * import Common.LongFilePathOs as os =20 @@ -84,4 +85,4 @@ class ExceptionCheck(object): # if __name__ =3D=3D '__main__': El =3D ExceptionCheck('C:\\Hess\\Project\\BuildTool\\src\\Ecc\\excepti= on.xml') - print El.ExceptionList + print(El.ExceptionList) diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py= b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py index fc65e9a2bd3c..a056c3759fb1 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py @@ -14,6 +14,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os =20 import Common.EdkLogger as EdkLogger @@ -99,7 +100,7 @@ class Table(object): try: self.Cur.execute(SqlCommand) except Exception as e: - print "An error occurred when Drop a table:", e.args[0] + print("An error occurred when Drop a table:", e.args[0]) =20 ## Get count # diff --git a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py b/BaseTools/Sou= rce/Python/Ecc/Xml/XmlRoutines.py index d5fb80fcf982..811106133cb4 100644 --- a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py +++ b/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py @@ -15,6 +15,7 @@ ## # Import Modules # +from __future__ import print_function import xml.dom.minidom from Common.LongFilePathSupport import OpenLongFilePath as open =20 @@ -215,7 +216,7 @@ def XmlParseFile(FileName): XmlFile.close() return Dom except Exception as X: - print X + print(X) return "" =20 # This acts like the main() function for the script, unless it is 'import'= ed @@ -225,5 +226,5 @@ if __name__ =3D=3D '__main__': A =3D CreateXmlElement('AAA', 'CCC', [['AAA', '111'], ['BBB', '222']]= , [['A', '1'], ['B', '2']]) B =3D CreateXmlElement('ZZZ', 'CCC', [['XXX', '111'], ['YYY', '222']]= , [['A', '1'], ['B', '2']]) C =3D CreateXmlList('DDD', 'EEE', [A, B], ['FFF', 'GGG']) - print C.toprettyxml(indent =3D " ") + print(C.toprettyxml(indent =3D " ")) pass diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc= /c.py index 99b22725e6ba..e2a5cc8487fa 100644 --- a/BaseTools/Source/Python/Ecc/c.py +++ b/BaseTools/Source/Python/Ecc/c.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from __future__ import print_function import sys import Common.LongFilePathOs as os import re @@ -2285,7 +2286,7 @@ def CheckDoxygenTripleForwardSlash(FullFileName): for Result in ResultSet: CommentSet.append(Result) except: - print 'Unrecognized chars in comment of file %s', FullFileName + print('Unrecognized chars in comment of file %s', FullFileName) =20 =20 for Result in CommentSet: @@ -2438,7 +2439,7 @@ def CheckFuncHeaderDoxygenComments(FullFileName): for Result in ResultSet: CommentSet.append(Result) except: - print 'Unrecognized chars in comment of file %s', FullFileName + print('Unrecognized chars in comment of file %s', FullFileName) =20 # Func Decl check SqlStatement =3D """ select Modifier, Name, StartLine, ID, Value @@ -2469,7 +2470,7 @@ def CheckFuncHeaderDoxygenComments(FullFileName): for Result in ResultSet: CommentSet.append(Result) except: - print 'Unrecognized chars in comment of file %s', FullFileName + print('Unrecognized chars in comment of file %s', FullFileName) =20 SqlStatement =3D """ select Modifier, Header, StartLine, ID, Name from Function @@ -2634,9 +2635,9 @@ if __name__ =3D=3D '__main__': try: test_file =3D sys.argv[1] except IndexError as v: - print "Usage: %s filename" % sys.argv[0] + print("Usage: %s filename" % sys.argv[0]) sys.exit(1) MsgList =3D CheckFuncHeaderDoxygenComments(test_file) for Msg in MsgList: - print Msg - print 'Done!' + print(Msg) + print('Done!') diff --git a/BaseTools/Source/Python/Eot/CParser.py b/BaseTools/Source/Pyth= on/Eot/CParser.py index ddc6cbd506aa..80cf278cf87c 100644 --- a/BaseTools/Source/Python/Eot/CParser.py +++ b/BaseTools/Source/Python/Eot/CParser.py @@ -1,5 +1,6 @@ # $ANTLR 3.0.1 C.g 2010-02-23 09:58:53 =20 +from __future__ import print_function from antlr3 import * from antlr3.compat import set, frozenset =20 @@ -102,7 +103,7 @@ class CParser(Parser): self.postfix_expression_stack =3D [] =20 def printTokenInfo(self, line, offset, tokenText): - print str(line)+ ',' + str(offset) + ':' + str(tokenText) + print(str(line)+ ',' + str(offset) + ':' + str(tokenText)) =20 def StorePredicateExpression(self, StartLine, StartOffset, EndLine, En= dOffset, Text): PredExp =3D CodeFragment.PredicateExpression(Text, (StartLine, StartO= ffset), (EndLine, EndOffset)) diff --git a/BaseTools/Source/Python/Eot/CodeFragmentCollector.py b/BaseToo= ls/Source/Python/Eot/CodeFragmentCollector.py index 87f179206d84..1e30e2ce62e2 100644 --- a/BaseTools/Source/Python/Eot/CodeFragmentCollector.py +++ b/BaseTools/Source/Python/Eot/CodeFragmentCollector.py @@ -15,6 +15,7 @@ ## # Import Modules # +from __future__ import print_function import re import Common.LongFilePathOs as os import sys @@ -379,49 +380,49 @@ class CodeFragmentCollector: # def PrintFragments(self): =20 - print '################# ' + self.FileName + '####################= #' + print('################# ' + self.FileName + '####################= #') =20 - print '/****************************************/' - print '/*************** ASSIGNMENTS ***************/' - print '/****************************************/' + print('/****************************************/') + print('/*************** ASSIGNMENTS ***************/') + print('/****************************************/') for asign in FileProfile.AssignmentExpressionList: - print str(asign.StartPos) + asign.Name + asign.Operator + asig= n.Value + print(str(asign.StartPos) + asign.Name + asign.Operator + asig= n.Value) =20 - print '/****************************************/' - print '/********* PREPROCESS DIRECTIVES ********/' - print '/****************************************/' + print('/****************************************/') + print('/********* PREPROCESS DIRECTIVES ********/') + print('/****************************************/') for pp in FileProfile.PPDirectiveList: - print str(pp.StartPos) + pp.Content + print(str(pp.StartPos) + pp.Content) =20 - print '/****************************************/' - print '/********* VARIABLE DECLARATIONS ********/' - print '/****************************************/' + print('/****************************************/') + print('/********* VARIABLE DECLARATIONS ********/') + print('/****************************************/') for var in FileProfile.VariableDeclarationList: - print str(var.StartPos) + var.Modifier + ' '+ var.Declarator + print(str(var.StartPos) + var.Modifier + ' '+ var.Declarator) =20 - print '/****************************************/' - print '/********* FUNCTION DEFINITIONS *********/' - print '/****************************************/' + print('/****************************************/') + print('/********* FUNCTION DEFINITIONS *********/') + print('/****************************************/') for func in FileProfile.FunctionDefinitionList: - print str(func.StartPos) + func.Modifier + ' '+ func.Declarato= r + ' ' + str(func.NamePos) + print(str(func.StartPos) + func.Modifier + ' '+ func.Declarato= r + ' ' + str(func.NamePos)) =20 - print '/****************************************/' - print '/************ ENUMERATIONS **************/' - print '/****************************************/' + print('/****************************************/') + print('/************ ENUMERATIONS **************/') + print('/****************************************/') for enum in FileProfile.EnumerationDefinitionList: - print str(enum.StartPos) + enum.Content + print(str(enum.StartPos) + enum.Content) =20 - print '/****************************************/' - print '/*********** STRUCTS/UNIONS *************/' - print '/****************************************/' + print('/****************************************/') + print('/*********** STRUCTS/UNIONS *************/') + print('/****************************************/') for su in FileProfile.StructUnionDefinitionList: - print str(su.StartPos) + su.Content + print(str(su.StartPos) + su.Content) =20 - print '/****************************************/' - print '/************** TYPEDEFS ****************/' - print '/****************************************/' + print('/****************************************/') + print('/************** TYPEDEFS ****************/') + print('/****************************************/') for typedef in FileProfile.TypedefDefinitionList: - print str(typedef.StartPos) + typedef.ToType + print(str(typedef.StartPos) + typedef.ToType) =20 ## # @@ -430,4 +431,4 @@ class CodeFragmentCollector: # if __name__ =3D=3D "__main__": =20 - print "For Test." + print("For Test.") diff --git a/BaseTools/Source/Python/Eot/InfParserLite.py b/BaseTools/Sourc= e/Python/Eot/InfParserLite.py index 584a95d6f3e4..24f0d50246e5 100644 --- a/BaseTools/Source/Python/Eot/InfParserLite.py +++ b/BaseTools/Source/Python/Eot/InfParserLite.py @@ -14,6 +14,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os import Common.EdkLogger as EdkLogger from Common.DataType import * @@ -164,8 +165,8 @@ if __name__ =3D=3D '__main__': Db.InitDatabase() P =3D EdkInfParser(os.path.normpath("C:\Framework\Edk\Sample\Platform\= Nt32\Dxe\PlatformBds\PlatformBds.inf"), Db, '', '') for Inf in P.Sources: - print Inf + print(Inf) for Item in P.Macros: - print Item, P.Macros[Item] + print(Item, P.Macros[Item]) =20 - Db.Close() \ No newline at end of file + Db.Close() diff --git a/BaseTools/Source/Python/Eot/c.py b/BaseTools/Source/Python/Eot= /c.py index 8199ce5ee73e..c70f62f393a9 100644 --- a/BaseTools/Source/Python/Eot/c.py +++ b/BaseTools/Source/Python/Eot/c.py @@ -15,6 +15,7 @@ ## # Import Modules # +from __future__ import print_function import sys import Common.LongFilePathOs as os import re @@ -384,4 +385,4 @@ if __name__ =3D=3D '__main__': EdkLogger.SetLevel(EdkLogger.QUIET) CollectSourceCodeDataIntoDB(sys.argv[1]) =20 - print 'Done!' + print('Done!') diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index 20f3e3999b90..a61837e27b31 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -16,6 +16,7 @@ ## # Import Modules # +from __future__ import print_function import re =20 import Fd @@ -4765,7 +4766,7 @@ if __name__ =3D=3D "__main__": try: test_file =3D sys.argv[1] except IndexError as v: - print "Usage: %s filename" % sys.argv[0] + print("Usage: %s filename" % sys.argv[0]) sys.exit(1) =20 parser =3D FdfParser(test_file) @@ -4773,7 +4774,7 @@ if __name__ =3D=3D "__main__": parser.ParseFile() parser.CycleReferenceCheck() except Warning as X: - print str(X) + print(str(X)) else: - print "Success!" + print("Success!") =20 diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Py= thon/GenFds/GenFds.py index ba3950dacd8a..1552ab4ee3a8 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -15,6 +15,7 @@ ## # Import Modules # +from __future__ import print_function from optparse import OptionParser import sys import Common.LongFilePathOs as os @@ -689,7 +690,7 @@ class GenFds : ModuleDict =3D BuildDb.BuildObject[DscFile, TAB_COMMON, GenFdsGlob= alVariable.TargetName, GenFdsGlobalVariable.ToolChainTag].Modules for Key in ModuleDict: ModuleObj =3D BuildDb.BuildObject[Key, TAB_COMMON, GenFdsGloba= lVariable.TargetName, GenFdsGlobalVariable.ToolChainTag] - print ModuleObj.BaseName + ' ' + ModuleObj.ModuleType + print(ModuleObj.BaseName + ' ' + ModuleObj.ModuleType) =20 def GenerateGuidXRefFile(BuildDb, ArchList, FdfParserObj): GuidXRefFileName =3D os.path.join(GenFdsGlobalVariable.FvDir, "Gui= d.xref") diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseT= ools/Source/Python/GenFds/GenFdsGlobalVariable.py index c1d656227609..73b52030d929 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -15,6 +15,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os import sys import subprocess @@ -736,7 +737,7 @@ class GenFdsGlobalVariable: GenFdsGlobalVariable.InfLogger (out) GenFdsGlobalVariable.InfLogger (error) if PopenObject.returncode !=3D 0: - print "###", cmd + print("###", cmd) EdkLogger.error("GenFds", COMMAND_FAILURE, errorMess) =20 def VerboseLogger (msg): diff --git a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py b= /BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py index f40c8bd01b23..d7084fbe88da 100644 --- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py +++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py @@ -17,6 +17,7 @@ # =20 #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D External Libraries =3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +from __future__ import print_function import optparse import Common.LongFilePathOs as os import re @@ -216,7 +217,7 @@ if __name__ =3D=3D '__main__': (options, args) =3D parser.parse_args() =20 if options.mapfile is None or options.efifile is None: - print parser.get_usage() + print(parser.get_usage()) elif os.path.exists(options.mapfile) and os.path.exists(options.efifil= e): list =3D parsePcdInfoFromMapFile(options.mapfile, options.efifile) if list is not None: @@ -225,6 +226,6 @@ if __name__ =3D=3D '__main__': else: generatePcdTable(list, options.mapfile.replace('.map', '.B= inaryPcdTable.txt')) else: - print 'Fail to generate Patch PCD Table based on map file and = efi file' + print('Fail to generate Patch PCD Table based on map file and = efi file') else: - print 'Fail to generate Patch PCD Table for fail to find map file = or efi file!' + print('Fail to generate Patch PCD Table for fail to find map file = or efi file!') diff --git a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py b/BaseTools/Sou= rce/Python/Pkcs7Sign/Pkcs7Sign.py index de8575676cac..4f79d0f82967 100644 --- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py +++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py @@ -19,6 +19,7 @@ ''' Pkcs7Sign ''' +from __future__ import print_function =20 import os import sys @@ -113,14 +114,14 @@ if __name__ =3D=3D '__main__': try: Process =3D subprocess.Popen('%s version' % (OpenSslCommand), stdout= =3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell=3DTrue) except: - print 'ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH' + print('ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH') sys.exit(1) =20 Version =3D Process.communicate() if Process.returncode <> 0: - print 'ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH' + print('ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH') sys.exit(Process.returncode) - print Version[0] + print(Version[0]) =20 # # Read input file into a buffer and save input filename @@ -134,7 +135,7 @@ if __name__ =3D=3D '__main__': # OutputDir =3D os.path.dirname(args.OutputFile) if not os.path.exists(OutputDir): - print 'ERROR: The output path does not exist: %s' % OutputDir + print('ERROR: The output path does not exist: %s' % OutputDir) sys.exit(1) args.OutputFileName =3D args.OutputFile =20 @@ -170,7 +171,7 @@ if __name__ =3D=3D '__main__': args.SignerPrivateCertFile =3D open(args.SignerPrivateCertFileName= , 'rb') args.SignerPrivateCertFile.close() except: - print 'ERROR: test signer private cert file %s missing' % (args.Si= gnerPrivateCertFileName) + print('ERROR: test signer private cert file %s missing' % (args.Si= gnerPrivateCertFileName)) sys.exit(1) =20 # @@ -196,7 +197,7 @@ if __name__ =3D=3D '__main__': args.OtherPublicCertFile =3D open(args.OtherPublicCertFileName, 'r= b') args.OtherPublicCertFile.close() except: - print 'ERROR: test other public cert file %s missing' % (args.Othe= rPublicCertFileName) + print('ERROR: test other public cert file %s missing' % (args.Othe= rPublicCertFileName)) sys.exit(1) =20 format =3D "%dsQ" % len(args.InputFileBuffer) @@ -242,11 +243,11 @@ if __name__ =3D=3D '__main__': args.TrustedPublicCertFile =3D open(args.TrustedPublicCertFileName= , 'rb') args.TrustedPublicCertFile.close() except: - print 'ERROR: test trusted public cert file %s missing' % (args.Tr= ustedPublicCertFileName) + print('ERROR: test trusted public cert file %s missing' % (args.Tr= ustedPublicCertFileName)) sys.exit(1) =20 if not args.SignatureSizeStr: - print "ERROR: please use the option --signature-size to specify the = size of the signature data!" + print("ERROR: please use the option --signature-size to specify the = size of the signature data!") sys.exit(1) else: if args.SignatureSizeStr.upper().startswith('0X'): @@ -254,10 +255,10 @@ if __name__ =3D=3D '__main__': else: SignatureSize =3D (long)(args.SignatureSizeStr) if SignatureSize < 0: - print "ERROR: The value of option --signature-size can't be set to= negative value!" + print("ERROR: The value of option --signature-size can't be set to= negative value!") sys.exit(1) elif SignatureSize > len(args.InputFileBuffer): - print "ERROR: The value of option --signature-size is exceed the s= ize of the input file !" + print("ERROR: The value of option --signature-size is exceed the s= ize of the input file !") sys.exit(1) =20 args.SignatureBuffer =3D args.InputFileBuffer[0:SignatureSize] @@ -277,7 +278,7 @@ if __name__ =3D=3D '__main__': Process =3D subprocess.Popen('%s smime -verify -inform DER -content %s= -CAfile %s' % (OpenSslCommand, args.OutputFileName, args.TrustedPublicCert= FileName), stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, stderr=3Dsubp= rocess.PIPE, shell=3DTrue) Process.communicate(input=3Dargs.SignatureBuffer)[0] if Process.returncode <> 0: - print 'ERROR: Verification failed' + print('ERROR: Verification failed') os.remove (args.OutputFileName) sys.exit(Process.returncode) =20 diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Generat= eKeys.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateK= eys.py index 9711de8f5c2e..41bcaa0437c5 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py @@ -22,6 +22,7 @@ ''' Rsa2048Sha256GenerateKeys ''' +from __future__ import print_function =20 import os import sys @@ -75,14 +76,14 @@ if __name__ =3D=3D '__main__': try: Process =3D subprocess.Popen('%s version' % (OpenSslCommand), stdout= =3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell=3DTrue) except: =20 - print 'ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH' + print('ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH') sys.exit(1) =20 Version =3D Process.communicate() if Process.returncode <> 0: - print 'ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH' + print('ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH') sys.exit(Process.returncode) - print Version[0] + print(Version[0]) =20 args.PemFileName =3D [] =20 @@ -103,7 +104,7 @@ if __name__ =3D=3D '__main__': Process =3D subprocess.Popen('%s genrsa -out %s 2048' % (OpenSslComm= and, Item.name), stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell= =3DTrue) Process.communicate() if Process.returncode <> 0: - print 'ERROR: RSA 2048 key generation failed' + print('ERROR: RSA 2048 key generation failed') sys.exit(Process.returncode) =20 # @@ -125,7 +126,7 @@ if __name__ =3D=3D '__main__': Process =3D subprocess.Popen('%s rsa -in %s -modulus -noout' % (OpenSs= lCommand, Item), stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell= =3DTrue) PublicKeyHexString =3D Process.communicate()[0].split('=3D')[1].strip() if Process.returncode <> 0: - print 'ERROR: Unable to extract public key from private key' + print('ERROR: Unable to extract public key from private key') sys.exit(Process.returncode) PublicKey =3D '' for Index in range (0, len(PublicKeyHexString), 2): @@ -138,7 +139,7 @@ if __name__ =3D=3D '__main__': Process.stdin.write (PublicKey) PublicKeyHash =3D PublicKeyHash + Process.communicate()[0] if Process.returncode <> 0: - print 'ERROR: Unable to extract SHA 256 hash of public key' + print('ERROR: Unable to extract SHA 256 hash of public key') sys.exit(Process.returncode) =20 # @@ -171,4 +172,4 @@ if __name__ =3D=3D '__main__': # If verbose is enabled display the public key in C structure format # if args.Verbose: - print 'PublicKeySha256 =3D ' + PublicKeyHashC =20 + print('PublicKeySha256 =3D ' + PublicKeyHashC) diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py= b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py index d36a14ffb775..2944b634fb7a 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py @@ -17,6 +17,7 @@ ''' Rsa2048Sha256Sign ''' +from __future__ import print_function =20 import os import sys @@ -96,14 +97,14 @@ if __name__ =3D=3D '__main__': try: Process =3D subprocess.Popen('%s version' % (OpenSslCommand), stdout= =3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell=3DTrue) except: =20 - print 'ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH' + print('ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH') sys.exit(1) =20 Version =3D Process.communicate() if Process.returncode <> 0: - print 'ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH' + print('ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH') sys.exit(Process.returncode) - print Version[0] + print(Version[0]) =20 # # Read input file into a buffer and save input filename @@ -117,7 +118,7 @@ if __name__ =3D=3D '__main__': # OutputDir =3D os.path.dirname(args.OutputFile) if not os.path.exists(OutputDir): - print 'ERROR: The output path does not exist: %s' % OutputDir + print('ERROR: The output path does not exist: %s' % OutputDir) sys.exit(1) args.OutputFileName =3D args.OutputFile =20 @@ -144,7 +145,7 @@ if __name__ =3D=3D '__main__': args.PrivateKeyFile =3D open(args.PrivateKeyFileName, 'rb') args.PrivateKeyFile.close() except: - print 'ERROR: test signing private key file %s missing' % (args.Priv= ateKeyFileName) + print('ERROR: test signing private key file %s missing' % (args.Priv= ateKeyFileName)) sys.exit(1) =20 # @@ -202,14 +203,14 @@ if __name__ =3D=3D '__main__': # Verify that the Hash Type matches the expected SHA256 type # if uuid.UUID(bytes_le =3D Header.HashType) <> EFI_HASH_ALGORITHM_SHA25= 6_GUID: - print 'ERROR: unsupport hash GUID' + print('ERROR: unsupport hash GUID') sys.exit(1) =20 # # Verify the public key # if Header.PublicKey <> PublicKey: - print 'ERROR: Public key in input file does not match public key fro= m private key file' + print('ERROR: Public key in input file does not match public key fro= m private key file') sys.exit(1) =20 FullInputFileBuffer =3D args.InputFileBuffer @@ -228,7 +229,7 @@ if __name__ =3D=3D '__main__': Process =3D subprocess.Popen('%s dgst -sha256 -prverify "%s" -signatur= e %s' % (OpenSslCommand, args.PrivateKeyFileName, args.OutputFileName), std= in=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, s= hell=3DTrue) Process.communicate(input=3DFullInputFileBuffer) if Process.returncode <> 0: - print 'ERROR: Verification failed' + print('ERROR: Verification failed') os.remove (args.OutputFileName) sys.exit(Process.returncode) =20 diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/S= ource/Python/TargetTool/TargetTool.py index 9fb89549cc29..0d4a59198e7b 100644 --- a/BaseTools/Source/Python/TargetTool/TargetTool.py +++ b/BaseTools/Source/Python/TargetTool/TargetTool.py @@ -12,6 +12,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IM= PLIED. # =20 +from __future__ import print_function import Common.LongFilePathOs as os import sys import traceback @@ -32,7 +33,7 @@ class TargetTool(): self.Arg =3D args[0] self.FileName =3D os.path.normpath(os.path.join(self.WorkSpace, '= Conf', 'target.txt')) if os.path.isfile(self.FileName) =3D=3D False: - print "%s does not exist." % self.FileName + print("%s does not exist." % self.FileName) sys.exit(1) self.TargetTxtDictionary =3D { TAB_TAT_DEFINES_ACTIVE_PLATFORM : N= one, @@ -83,14 +84,14 @@ class TargetTool(): errMsg =3D '' for Key in self.TargetTxtDictionary: if type(self.TargetTxtDictionary[Key]) =3D=3D type([]): - print "%-30s =3D %s" % (Key, ''.join(elem + ' ' for elem i= n self.TargetTxtDictionary[Key])) + print("%-30s =3D %s" % (Key, ''.join(elem + ' ' for elem i= n self.TargetTxtDictionary[Key]))) elif self.TargetTxtDictionary[Key] is None: errMsg +=3D " Missing %s configuration information, pleas= e use TargetTool to set value!" % Key + os.linesep=20 else: - print "%-30s =3D %s" % (Key, self.TargetTxtDictionary[Key]) + print("%-30s =3D %s" % (Key, self.TargetTxtDictionary[Key]= )) =20 if errMsg !=3D '': - print os.linesep + 'Warning:' + os.linesep + errMsg + print(os.linesep + 'Warning:' + os.linesep + errMsg) =20 def RWFile(self, CommentCharacter, KeySplitCharacter, Num): try: @@ -109,7 +110,7 @@ class TargetTool(): if Key not in existKeys: existKeys.append(Key) else: - print "Warning: Found duplicate key item i= n original configuration files!" + print("Warning: Found duplicate key item i= n original configuration files!") =20 if Num =3D=3D 0: Line =3D "%-30s =3D \n" % Key @@ -120,7 +121,7 @@ class TargetTool(): fw.write(Line) for key in self.TargetTxtDictionary: if key not in existKeys: - print "Warning: %s does not exist in original configur= ation file" % key + print("Warning: %s does not exist in original configur= ation file" % key) Line =3D GetConfigureKeyValue(self, key) if Line is None: Line =3D "%-30s =3D " % key @@ -223,25 +224,25 @@ if __name__ =3D=3D '__main__': EdkLogger.Initialize() EdkLogger.SetLevel(EdkLogger.QUIET) if os.getenv('WORKSPACE') is None: - print "ERROR: WORKSPACE should be specified or edksetup script sho= uld be executed before run TargetTool" + print("ERROR: WORKSPACE should be specified or edksetup script sho= uld be executed before run TargetTool") sys.exit(1) =20 (opt, args) =3D MyOptionParser() if len(args) !=3D 1 or (args[0].lower() !=3D 'print' and args[0].lower= () !=3D 'clean' and args[0].lower() !=3D 'set'): - print "The number of args isn't 1 or the value of args is invalid." + print("The number of args isn't 1 or the value of args is invalid.= ") sys.exit(1) if opt.NUM is not None and opt.NUM < 1: - print "The MAX_CONCURRENT_THREAD_NUMBER must be larger than 0." + print("The MAX_CONCURRENT_THREAD_NUMBER must be larger than 0.") sys.exit(1) if opt.TARGET is not None and len(opt.TARGET) > 1: for elem in opt.TARGET: if elem =3D=3D '0': - print "0 will clear the TARGET setting in target.txt and c= an't combine with other value." + print("0 will clear the TARGET setting in target.txt and c= an't combine with other value.") sys.exit(1) if opt.TARGET_ARCH is not None and len(opt.TARGET_ARCH) > 1: for elem in opt.TARGET_ARCH: if elem =3D=3D '0': - print "0 will clear the TARGET_ARCH setting in target.txt = and can't combine with other value." + print("0 will clear the TARGET_ARCH setting in target.txt = and can't combine with other value.") sys.exit(1) =20 try: diff --git a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py b/Ba= seTools/Source/Python/UPT/Library/ExpressionValidate.py index ca21e6995217..afa5b2407ec5 100644 --- a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py +++ b/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py @@ -14,6 +14,7 @@ ''' ExpressionValidate ''' +from __future__ import print_function =20 ## # Import Modules @@ -566,7 +567,7 @@ def IsValidFeatureFlagExp(Token, Flag=3DFalse): =20 if __name__ =3D=3D '__main__': # print IsValidRangeExpr('LT 9') - print _LogicalExpressionParser('gCrownBayTokenSpaceGuid.PcdPciDevice1B= ridgeAddressLE0').IsValidLogicalExpression() + print(_LogicalExpressionParser('gCrownBayTokenSpaceGuid.PcdPciDevice1B= ridgeAddressLE0').IsValidLogicalExpression()) =20 =20 =20 diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTo= ols/Source/Python/UPT/Library/UniClassObject.py index 299cd871444b..a464cbf702f7 100644 --- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py +++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py @@ -14,6 +14,7 @@ """ Collect all defined strings in multiple uni files """ +from __future__ import print_function =20 ## # Import Modules @@ -730,7 +731,7 @@ class UniFileClassObject(object): EdkLogger.Error("Unicode File Parser", ToolError.FORMA= T_INVALID, ExtraData=3DFile.Path) NewLines.append(Line) else: - print Line + print(Line) EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_IN= VALID, ExtraData=3DFile.Path) =20 if StrName and not StrName.split()[1].startswith(u'STR_'): @@ -1022,12 +1023,12 @@ class UniFileClassObject(object): # Show the instance itself # def ShowMe(self): - print self.LanguageDef + print(self.LanguageDef) #print self.OrderedStringList for Item in self.OrderedStringList: - print Item + print(Item) for Member in self.OrderedStringList[Item]: - print str(Member) + print(str(Member)) =20 # # Read content from '!include' UNI file=20 diff --git a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py b/Ba= seTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py index 436dc90e6dd3..074aa311f31d 100644 --- a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py +++ b/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py @@ -15,6 +15,7 @@ ''' DecPomAlignment ''' +from __future__ import print_function =20 ## # Import Modules @@ -902,47 +903,47 @@ class DecPomAlignment(PackageObject): # Print all members and their values of Package class # def ShowPackage(self): - print '\nName =3D', self.GetName() - print '\nBaseName =3D', self.GetBaseName() - print '\nVersion =3D', self.GetVersion()=20 - print '\nGuid =3D', self.GetGuid() + print('\nName =3D', self.GetName()) + print('\nBaseName =3D', self.GetBaseName()) + print('\nVersion =3D', self.GetVersion()) + print('\nGuid =3D', self.GetGuid()) =20 - print '\nStandardIncludes =3D %d ' \ - % len(self.GetStandardIncludeFileList()), + print('\nStandardIncludes =3D %d ' \ + % len(self.GetStandardIncludeFileList()), end=3D' ') for Item in self.GetStandardIncludeFileList(): - print Item.GetFilePath(), ' ', Item.GetSupArchList() - print '\nPackageIncludes =3D %d \n' \ - % len(self.GetPackageIncludeFileList()), + print(Item.GetFilePath(), ' ', Item.GetSupArchList()) + print('\nPackageIncludes =3D %d \n' \ + % len(self.GetPackageIncludeFileList()), end=3D' ') for Item in self.GetPackageIncludeFileList(): - print Item.GetFilePath(), ' ', Item.GetSupArchList() + print(Item.GetFilePath(), ' ', Item.GetSupArchList()) =20 - print '\nGuids =3D', self.GetGuidList() + print('\nGuids =3D', self.GetGuidList()) for Item in self.GetGuidList(): - print Item.GetCName(), Item.GetGuid(), Item.GetSupArchList() - print '\nProtocols =3D', self.GetProtocolList() + print(Item.GetCName(), Item.GetGuid(), Item.GetSupArchList()) + print('\nProtocols =3D', self.GetProtocolList()) for Item in self.GetProtocolList(): - print Item.GetCName(), Item.GetGuid(), Item.GetSupArchList() - print '\nPpis =3D', self.GetPpiList() + print(Item.GetCName(), Item.GetGuid(), Item.GetSupArchList()) + print('\nPpis =3D', self.GetPpiList()) for Item in self.GetPpiList(): - print Item.GetCName(), Item.GetGuid(), Item.GetSupArchList() - print '\nLibraryClasses =3D', self.GetLibraryClassList() + print(Item.GetCName(), Item.GetGuid(), Item.GetSupArchList()) + print('\nLibraryClasses =3D', self.GetLibraryClassList()) for Item in self.GetLibraryClassList(): - print Item.GetLibraryClass(), Item.GetRecommendedInstance(), \ - Item.GetSupArchList() - print '\nPcds =3D', self.GetPcdList() + print(Item.GetLibraryClass(), Item.GetRecommendedInstance(), \ + Item.GetSupArchList()) + print('\nPcds =3D', self.GetPcdList()) for Item in self.GetPcdList(): - print 'CName=3D', Item.GetCName(), 'TokenSpaceGuidCName=3D', \ + print('CName=3D', Item.GetCName(), 'TokenSpaceGuidCName=3D', \ Item.GetTokenSpaceGuidCName(), \ 'DefaultValue=3D', Item.GetDefaultValue(), \ 'ValidUsage=3D', Item.GetValidUsage(), \ 'SupArchList', Item.GetSupArchList(), \ - 'Token=3D', Item.GetToken(), 'DatumType=3D', Item.GetDatum= Type() + 'Token=3D', Item.GetToken(), 'DatumType=3D', Item.GetDatum= Type()) =20 for Item in self.GetMiscFileList(): - print Item.GetName() + print(Item.GetName()) for FileObjectItem in Item.GetFileList(): - print FileObjectItem.GetURI() - print '****************\n' + print(FileObjectItem.GetURI()) + print('****************\n') =20 ## GenPcdDeclaration # diff --git a/BaseTools/Source/Python/UPT/UnitTest/DecParserTest.py b/BaseTo= ols/Source/Python/UPT/UnitTest/DecParserTest.py index 8b4ece2617a1..5f0abcafef27 100644 --- a/BaseTools/Source/Python/UPT/UnitTest/DecParserTest.py +++ b/BaseTools/Source/Python/UPT/UnitTest/DecParserTest.py @@ -11,6 +11,7 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 +from __future__ import print_function import os import unittest =20 @@ -66,7 +67,7 @@ def TestTemplate(TestString, TestFunc): # Close file f.close() except: - print 'Can not create temporary file [%s]!' % Path + print('Can not create temporary file [%s]!' % Path) exit(-1) =20 # Call test function to test @@ -279,6 +280,6 @@ if __name__ =3D=3D '__main__': unittest.FunctionTestCase(TestDecPcd).runTest() unittest.FunctionTestCase(TestDecUserExtension).runTest() =20 - print 'All tests passed...' + print('All tests passed...') =20 =20 diff --git a/BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py b= /BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py index f3b43ee0bc27..626f17426de7 100644 --- a/BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py +++ b/BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py @@ -11,6 +11,7 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 +from __future__ import print_function import os #import Object.Parser.InfObject as InfObject from Object.Parser.InfCommonObject import CurrentLine @@ -271,7 +272,7 @@ def PrepareTest(String): TempFile =3D open (FileName, "w") =20 TempFile.close() except: - print "File Create Error" + print("File Create Error") CurrentLine =3D CurrentLine() CurrentLine.SetFileName("Test") CurrentLine.SetLineString(Item[0]) @@ -376,11 +377,11 @@ if __name__ =3D=3D '__main__': try: InfBinariesInstance.SetBinary(Ver =3D Ver, ArchList =3D Ar= chList) except: - print "Test Failed!" + print("Test Failed!") AllPassedFlag =3D False =20 if AllPassedFlag : - print 'All tests passed...' + print('All tests passed...') else: - print 'Some unit test failed!' + print('Some unit test failed!') =20 diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index a001162e8e3b..7f289c103fb9 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -17,6 +17,7 @@ # This class is used to retrieve information stored in database and conve= rt them # into PlatformBuildClassObject form for easier use for AutoGen. # +from __future__ import print_function from Common.StringUtils import * from Common.DataType import * from Common.Misc import * @@ -1373,7 +1374,7 @@ class DscBuildData(PlatformBuildClassObject): for (skuname,StoreName,PcdGuid,PcdName,PcdValue) in Str_Pcd_Va= lues: str_pcd_obj =3D S_pcd_set.get((PcdName, PcdGuid)) if str_pcd_obj is None: - print PcdName, PcdGuid + print(PcdName, PcdGuid) raise if str_pcd_obj.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_D= YNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_D= YNAMIC_EX_HII]]: @@ -1808,7 +1809,7 @@ class DscBuildData(PlatformBuildClassObject): 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])) except: - print "error" + print("error") try: Value, ValueSize =3D ParseFieldValue (FieldList[FieldN= ame][0]) except Exception: diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index a8f13d52c42d..2815c83af1b3 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -15,6 +15,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os import re import time @@ -1639,7 +1640,7 @@ class DscParser(MetaFileParser): try: self._ValueList[2] =3D '|'.join(ValList) except Exception: - print ValList + print(ValList) =20 def __ProcessComponent(self): self._ValueList[0] =3D ReplaceMacro(self._ValueList[0], self._Macr= os) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index 4600c46be1be..416aa73549d1 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -16,6 +16,7 @@ ## # Import Modules # +from __future__ import print_function import Common.LongFilePathOs as os import re import StringIO @@ -2195,7 +2196,7 @@ class Build(): toolsFile =3D os.path.join(FvDir, 'GuidedSectionTools.= txt') toolsFile =3D open(toolsFile, 'wt') for guidedSectionTool in guidAttribs: - print >> toolsFile, ' '.join(guidedSectionTool) + print(' '.join(guidedSectionTool), file=3DtoolsFil= e) toolsFile.close() =20 ## Returns the full path of the tool. diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py index 27afd79f2094..be7b4ad42856 100644 --- a/BaseTools/Tests/TestTools.py +++ b/BaseTools/Tests/TestTools.py @@ -1,3 +1,4 @@ +from __future__ import print_function ## @file # Utility functions and classes for BaseTools unit tests # @@ -91,9 +92,9 @@ class BaseToolsTest(unittest.TestCase): os.remove(path) =20 def DisplayBinaryData(self, description, data): - print description, '(base64 encoded):' + print(description, '(base64 encoded):') b64data =3D base64.b64encode(data) - print b64data + print(b64data) =20 def DisplayFile(self, fileName): sys.stdout.write(self.ReadTmpFile(fileName)) diff --git a/BaseTools/Tests/TianoCompress.py b/BaseTools/Tests/TianoCompre= ss.py index e14136416211..f6a4a6ae9c5d 100644 --- a/BaseTools/Tests/TianoCompress.py +++ b/BaseTools/Tests/TianoCompress.py @@ -15,6 +15,7 @@ ## # Import Modules # +from __future__ import print_function import os import random import sys @@ -52,8 +53,8 @@ class Tests(TestTools.BaseToolsTest): finish =3D self.ReadTmpFile('output2') startEqualsFinish =3D start =3D=3D finish if not startEqualsFinish: - print - print 'Original data did not match decompress(compress(data))' + print() + print('Original data did not match decompress(compress(data))') self.DisplayBinaryData('original data', start) self.DisplayBinaryData('after compression', self.ReadTmpFile('= output1')) self.DisplayBinaryData('after decomression', finish) diff --git a/BaseTools/gcc/mingw-gcc-build.py b/BaseTools/gcc/mingw-gcc-bui= ld.py index 858b4020ef9f..643fec58a457 100755 --- a/BaseTools/gcc/mingw-gcc-build.py +++ b/BaseTools/gcc/mingw-gcc-build.py @@ -17,6 +17,7 @@ # =20 =20 +from __future__ import print_function from optparse import OptionParser import os import shutil @@ -34,7 +35,7 @@ if sys.version_info < (2, 5): # # This script (and edk2 BaseTools) require Python 2.5 or newer # - print 'Python version 2.5 or later is required.' + print('Python version 2.5 or later is required.') sys.exit(-1) =20 # @@ -146,37 +147,37 @@ class Config: if not self.options.skip_gcc: building.append('gcc') if len(building) =3D=3D 0: - print "Nothing will be built!" - print - print "Please try using --help and then change the configurati= on." + print("Nothing will be built!") + print() + print("Please try using --help and then change the configurati= on.") return False =20 - print "Current directory:" - print " ", self.base_dir - print "Sources download/extraction:", self.Relative(self.src_dir) - print "Build directory :", self.Relative(self.build_dir) - print "Prefix (install) directory :", self.Relative(self.prefix) - print "Create symlinks directory :", self.Relative(self.symlinks) - print "Building :", ', '.join(building) - print + print("Current directory:") + print(" ", self.base_dir) + print("Sources download/extraction:", self.Relative(self.src_dir)) + print("Build directory :", self.Relative(self.build_dir= )) + print("Prefix (install) directory :", self.Relative(self.prefix)) + print("Create symlinks directory :", self.Relative(self.symlinks)) + print("Building :", ', '.join(building)) + print() answer =3D raw_input("Is this configuration ok? (default =3D no): = ") if (answer.lower() not in ('y', 'yes')): - print - print "Please try using --help and then change the configurati= on." + print() + print("Please try using --help and then change the configurati= on.") return False =20 if self.arch.lower() =3D=3D 'ipf': - print - print 'Please note that the IPF compiler built by this script = has' - print 'not yet been validated!' - print + print() + print('Please note that the IPF compiler built by this script = has') + print('not yet been validated!') + print() answer =3D raw_input("Are you sure you want to build it? (defa= ult =3D no): ") if (answer.lower() not in ('y', 'yes')): - print - print "Please try using --help and then change the configu= ration." + print() + print("Please try using --help and then change the configu= ration.") return False =20 - print + print() return True =20 def Relative(self, path): @@ -275,7 +276,7 @@ class SourceFiles: wDots =3D (100 * received * blockSize) / fileSize / 10 if wDots > self.dots: for i in range(wDots - self.dots): - print '.', + print('.', end=3D' ') sys.stdout.flush() self.dots +=3D 1 =20 @@ -286,18 +287,18 @@ class SourceFiles: self.dots =3D 0 local_file =3D os.path.join(self.config.src_dir, fdata= ['filename']) url =3D fdata['url'] - print 'Downloading %s:' % fname, url + print('Downloading %s:' % fname, url) if retries > 0: - print '(retry)', + print('(retry)', end=3D' ') sys.stdout.flush() =20 completed =3D False if os.path.exists(local_file): md5_pass =3D self.checkHash(fdata) if md5_pass: - print '[md5 match]', + print('[md5 match]', end=3D' ') else: - print '[md5 mismatch]', + print('[md5 mismatch]', end=3D' ') sys.stdout.flush() completed =3D md5_pass =20 @@ -313,32 +314,32 @@ class SourceFiles: if not completed and os.path.exists(local_file): md5_pass =3D self.checkHash(fdata) if md5_pass: - print '[md5 match]', + print('[md5 match]', end=3D' ') else: - print '[md5 mismatch]', + print('[md5 mismatch]', end=3D' ') sys.stdout.flush() completed =3D md5_pass =20 if completed: - print '[done]' + print('[done]') break else: - print '[failed]' - print ' Tried to retrieve', url - print ' to', local_file - print 'Possible fixes:' - print '* If you are behind a web-proxy, try settin= g the', - print 'http_proxy environment variable' - print '* You can try to download this file separat= ely', - print 'and rerun this script' + print('[failed]') + print(' Tried to retrieve', url) + print(' to', local_file) + print('Possible fixes:') + print('* If you are behind a web-proxy, try settin= g the', end=3D' ') + print('http_proxy environment variable') + print('* You can try to download this file separat= ely', end=3D' ') + print('and rerun this script') raise Exception() =20 except KeyboardInterrupt: - print '[KeyboardInterrupt]' + print('[KeyboardInterrupt]') return False =20 except Exception as e: - print e + print(e) =20 if not completed: return False =20 @@ -396,7 +397,7 @@ class Extracter: extractedMd5 =3D open(extracted).read() =20 if extractedMd5 !=3D moduleMd5: - print 'Extracting %s:' % self.config.Relative(local_file) + print('Extracting %s:' % self.config.Relative(local_file)) tar =3D tarfile.open(local_file) tar.extractall(extractDst) open(extracted, 'w').write(moduleMd5) @@ -480,7 +481,7 @@ class Builder: =20 os.chdir(base_dir) =20 - print '%s module is now built and installed' % module + print('%s module is now built and installed' % module) =20 def RunCommand(self, cmd, module, stage, skipable=3DFalse): if skipable: @@ -495,13 +496,13 @@ class Builder: stderr=3Dsubprocess.STDOUT ) =20 - print '%s [%s] ...' % (module, stage), + print('%s [%s] ...' % (module, stage), end=3D' ') sys.stdout.flush() p =3D popen(cmd) output =3D p.stdout.read() p.wait() if p.returncode !=3D 0: - print '[failed!]' + print('[failed!]') logFile =3D os.path.join(self.config.build_dir, 'log.txt') f =3D open(logFile, "w") f.write(output) @@ -509,7 +510,7 @@ class Builder: raise Exception, 'Failed to %s %s\n' % (stage, module) + \ 'See output log at %s' % self.config.Relative(logFile) else: - print '[done]' + print('[done]') =20 if skipable: self.MarkBuildStepComplete('%s.%s' % (module, stage)) @@ -526,13 +527,13 @@ class Builder: linkdst =3D os.path.join(links_dir, link) if not os.path.lexists(linkdst): if not startPrinted: - print 'Making symlinks in %s:' % self.config.Relative(= links_dir), + print('Making symlinks in %s:' % self.config.Relative(= links_dir), end=3D' ') startPrinted =3D True - print link, + print(link, end=3D' ') os.symlink(src, linkdst) =20 if startPrinted: - print '[done]' + print('[done]') =20 class App: """class App @@ -551,9 +552,9 @@ class App: sources =3D SourceFiles(config) result =3D sources.GetAll() if result: - print 'All files have been downloaded & verified' + print('All files have been downloaded & verified') else: - print 'An error occured while downloading a file' + print('An error occured while downloading a file') return =20 Extracter(sources, config).ExtractAll() --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556275968619.5451566779437; Wed, 20 Jun 2018 21:44:35 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 49079211D5068; Wed, 20 Jun 2018 21:44:25 -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 DB681211D505F for ; Wed, 20 Jun 2018 21:44:22 -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:19 +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:30 +0800 Message-Id: <20180621044346.28495-5-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 04/20] BaseTools: Remove the old python "not-equal" 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" Replace "<>" with "!=3D" to be compatible with python3. Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Source/Python/AutoGen/AutoGen.py | = 2 +- BaseTools/Source/Python/AutoGen/BuildEngine.py | = 4 ++-- BaseTools/Source/Python/AutoGen/GenMake.py | = 2 +- BaseTools/Source/Python/Common/Misc.py | = 2 +- BaseTools/Source/Python/Ecc/Check.py | 1= 4 +++++++------- BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py | = 6 +++--- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py | = 8 ++++---- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py | 1= 2 ++++++------ BaseTools/Source/Python/Workspace/DscBuildData.py | = 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index e268c4c0a1cf..d7485909414d 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -4233,7 +4233,7 @@ class ModuleAutoGen(AutoGen): Dpx =3D GenDepex.DependencyExpression(self.DepexList[ModuleTyp= e], ModuleType, True) DpxFile =3D gAutoGenDepexFileName % {"module_name" : self.Name} =20 - if len(Dpx.PostfixNotation) <> 0: + if len(Dpx.PostfixNotation) !=3D 0: self.DepexGenerated =3D True =20 if Dpx.Generate(path.join(self.OutputDir, DpxFile)): diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Sou= rce/Python/AutoGen/BuildEngine.py index d4daa3093761..cab4c993dc44 100644 --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py @@ -362,8 +362,8 @@ class BuildRule: self.RuleContent[Index] =3D Line =20 # find the build_rule_version - if Line and Line[0] =3D=3D "#" and Line.find(TAB_BUILD_RULE_VE= RSION) <> -1: - if Line.find("=3D") <> -1 and Line.find("=3D") < (len(Line= ) - 1) and (Line[(Line.find("=3D") + 1):]).split(): + if Line and Line[0] =3D=3D "#" and Line.find(TAB_BUILD_RULE_VE= RSION) !=3D -1: + if Line.find("=3D") !=3D -1 and Line.find("=3D") < (len(Li= ne) - 1) and (Line[(Line.find("=3D") + 1):]).split(): self._FileVersion =3D (Line[(Line.find("=3D") + 1):]).= split()[0] # skip empty or comment line if Line =3D=3D "" or Line[0] =3D=3D "#": diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index 48b66c570e0a..ea73de5fa55f 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -561,7 +561,7 @@ cleanlib: =20 # convert source files and binary files to build targets self.ResultFileList =3D [str(T.Target) for T in self._AutoGenObjec= t.CodaTargetList] - if len(self.ResultFileList) =3D=3D 0 and len(self._AutoGenObject.S= ourceFileList) <> 0: + if len(self.ResultFileList) =3D=3D 0 and len(self._AutoGenObject.S= ourceFileList) !=3D 0: EdkLogger.error("build", AUTOGEN_ERROR, "Nothing to build", ExtraData=3D"[%s]" % str(self._AutoGenObject)) =20 diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Pyth= on/Common/Misc.py index 5197818d3f27..01171adb9b9e 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -1293,7 +1293,7 @@ def ParseDevPathValue (Value): def ParseFieldValue (Value): if type(Value) =3D=3D type(0): return Value, (Value.bit_length() + 7) / 8 - if type(Value) <> type(''): + if type(Value) !=3D type(''): raise BadExpression('Type %s is %s' %(Value, type(Value))) Value =3D Value.strip() if Value.startswith(TAB_UINT8) and Value.endswith(')'): diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python= /Ecc/Check.py index dde7d7841082..ea739043e0bc 100644 --- a/BaseTools/Source/Python/Ecc/Check.py +++ b/BaseTools/Source/Python/Ecc/Check.py @@ -816,8 +816,8 @@ class Check(object): EccGlobalData.gDb.TblReport.Insert(ERROR_META_DATA_FIL= E_CHECK_LIBRARY_NO_USE, OtherMsg=3D"The Library Class [%s] is not used in a= ny platform" % (Record[1]), BelongsToTable=3D'Inf', BelongsToItem=3DRecord[= 0]) SqlCommand =3D """ select A.ID, A.Value1, A.BelongsToFile, A.StartLi= ne, B.StartLine from Dsc as A left join Dsc as B - where A.Model =3D %s and B.Model =3D %s and A.Sco= pe1 =3D B.Scope1 and A.Scope2 =3D B.Scope2 and A.ID <> B.ID - and A.Value1 =3D B.Value1 and A.Value2 <> B.Value= 2 and A.BelongsToItem =3D -1 and B.BelongsToItem =3D -1 and A.StartLine <> = B.StartLine and B.BelongsToFile =3D A.BelongsToFile""" \ + where A.Model =3D %s and B.Model =3D %s and A.Sco= pe1 =3D B.Scope1 and A.Scope2 =3D B.Scope2 and A.ID !=3D B.ID + and A.Value1 =3D B.Value1 and A.Value2 !=3D B.Val= ue2 and A.BelongsToItem =3D -1 and B.BelongsToItem =3D -1 and A.StartLine != =3D B.StartLine and B.BelongsToFile =3D A.BelongsToFile""" \ % (MODEL_EFI_LIBRARY_CLASS, MODEL_EFI_LIBRARY_= CLASS) RecordSet =3D EccGlobalData.gDb.TblDsc.Exec(SqlCommand) for Record in RecordSet: @@ -903,7 +903,7 @@ class Check(object): and A.Value1 =3D B.Value1 and A.Value2 =3D B.Value2 and A.Scope1 =3D B.Scope1 - and A.ID <> B.ID + and A.ID !=3D B.ID and A.Model =3D B.Model and A.Enabled > -1 and B.Enabled > -1 @@ -1055,7 +1055,7 @@ class Check(object): SqlCommand =3D """ select A.ID, A.Value3, A.BelongsToFile, B.Belongs= ToFile from %s as A, %s as B where A.Value2 =3D 'FILE_GUID' and B.Value2 =3D '= FILE_GUID' and - A.Value3 =3D B.Value3 and A.ID <> B.ID group by A= .ID + A.Value3 =3D B.Value3 and A.ID !=3D B.ID group by= A.ID """ % (Table.Table, Table.Table) RecordSet =3D Table.Exec(SqlCommand) for Record in RecordSet: @@ -1215,7 +1215,7 @@ class Check(object): SqlCommand =3D """ select A.ID, A.Value1 from %s as A, %s as B where A.Model =3D %s and B.Model =3D %s - and A.Value1 like B.Value1 and A.ID <> B.ID + and A.Value1 like B.Value1 and A.ID !=3D B.ID and A.Scope1 =3D B.Scope1 and A.Enabled > -1 and B.Enabled > -1 @@ -1239,8 +1239,8 @@ class Check(object): SqlCommand =3D """ select A.ID, A.Value1, A.Value2 from %s as A, %s as B where A.Model =3D %s and B.Model =3D %s - and A.Value2 like B.Value2 and A.ID <> B.ID - and A.Scope1 =3D B.Scope1 and A.Value1 <> B.Value1 + and A.Value2 like B.Value2 and A.ID !=3D B.ID + and A.Scope1 =3D B.Scope1 and A.Value1 !=3D B.Value1 group by A.ID """ % (Table.Table, Table.Table, Model, Model) RecordSet =3D Table.Exec(SqlCommand) diff --git a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py b/BaseTools/Sou= rce/Python/Pkcs7Sign/Pkcs7Sign.py index 4f79d0f82967..11d11700ed99 100644 --- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py +++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py @@ -118,7 +118,7 @@ if __name__ =3D=3D '__main__': sys.exit(1) =20 Version =3D Process.communicate() - if Process.returncode <> 0: + if Process.returncode !=3D 0: print('ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH') sys.exit(Process.returncode) print(Version[0]) @@ -208,7 +208,7 @@ if __name__ =3D=3D '__main__': # Process =3D subprocess.Popen('%s smime -sign -binary -signer "%s" -out= form DER -md sha256 -certfile "%s"' % (OpenSslCommand, args.SignerPrivateCe= rtFileName, args.OtherPublicCertFileName), stdin=3Dsubprocess.PIPE, stdout= =3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell=3DTrue) Signature =3D Process.communicate(input=3DFullInputFileBuffer)[0] - if Process.returncode <> 0: + if Process.returncode !=3D 0: sys.exit(Process.returncode) =20 # @@ -277,7 +277,7 @@ if __name__ =3D=3D '__main__': # Process =3D subprocess.Popen('%s smime -verify -inform DER -content %s= -CAfile %s' % (OpenSslCommand, args.OutputFileName, args.TrustedPublicCert= FileName), stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, stderr=3Dsubp= rocess.PIPE, shell=3DTrue) Process.communicate(input=3Dargs.SignatureBuffer)[0] - if Process.returncode <> 0: + if Process.returncode !=3D 0: print('ERROR: Verification failed') os.remove (args.OutputFileName) sys.exit(Process.returncode) diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Generat= eKeys.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateK= eys.py index 41bcaa0437c5..ca4f64864790 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py @@ -80,7 +80,7 @@ if __name__ =3D=3D '__main__': sys.exit(1) =20 Version =3D Process.communicate() - if Process.returncode <> 0: + if Process.returncode !=3D 0: print('ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH') sys.exit(Process.returncode) print(Version[0]) @@ -103,7 +103,7 @@ if __name__ =3D=3D '__main__': # Process =3D subprocess.Popen('%s genrsa -out %s 2048' % (OpenSslComm= and, Item.name), stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell= =3DTrue) Process.communicate() - if Process.returncode <> 0: + if Process.returncode !=3D 0: print('ERROR: RSA 2048 key generation failed') sys.exit(Process.returncode) =20 @@ -125,7 +125,7 @@ if __name__ =3D=3D '__main__': # Process =3D subprocess.Popen('%s rsa -in %s -modulus -noout' % (OpenSs= lCommand, Item), stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell= =3DTrue) PublicKeyHexString =3D Process.communicate()[0].split('=3D')[1].strip() - if Process.returncode <> 0: + if Process.returncode !=3D 0: print('ERROR: Unable to extract public key from private key') sys.exit(Process.returncode) PublicKey =3D '' @@ -138,7 +138,7 @@ if __name__ =3D=3D '__main__': Process =3D subprocess.Popen('%s dgst -sha256 -binary' % (OpenSslComma= nd), stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess= .PIPE, shell=3DTrue) Process.stdin.write (PublicKey) PublicKeyHash =3D PublicKeyHash + Process.communicate()[0] - if Process.returncode <> 0: + if Process.returncode !=3D 0: print('ERROR: Unable to extract SHA 256 hash of public key') sys.exit(Process.returncode) =20 diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py= b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py index 2944b634fb7a..2e164c4a2da6 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py @@ -101,7 +101,7 @@ if __name__ =3D=3D '__main__': sys.exit(1) =20 Version =3D Process.communicate() - if Process.returncode <> 0: + if Process.returncode !=3D 0: print('ERROR: Open SSL command not available. Please verify PATH or s= et OPENSSL_PATH') sys.exit(Process.returncode) print(Version[0]) @@ -157,7 +157,7 @@ if __name__ =3D=3D '__main__': while len(PublicKeyHexString) > 0: PublicKey =3D PublicKey + chr(int(PublicKeyHexString[0:2],16)) PublicKeyHexString=3DPublicKeyHexString[2:] - if Process.returncode <> 0: + if Process.returncode !=3D 0: sys.exit(Process.returncode) =20 if args.MonotonicCountStr: @@ -179,7 +179,7 @@ if __name__ =3D=3D '__main__': # Process =3D subprocess.Popen('%s dgst -sha256 -sign "%s"' % (OpenSslCo= mmand, args.PrivateKeyFileName), stdin=3Dsubprocess.PIPE, stdout=3Dsubproce= ss.PIPE, stderr=3Dsubprocess.PIPE, shell=3DTrue) Signature =3D Process.communicate(input=3DFullInputFileBuffer)[0] - if Process.returncode <> 0: + if Process.returncode !=3D 0: sys.exit(Process.returncode) =20 # @@ -202,14 +202,14 @@ if __name__ =3D=3D '__main__': # # Verify that the Hash Type matches the expected SHA256 type # - if uuid.UUID(bytes_le =3D Header.HashType) <> EFI_HASH_ALGORITHM_SHA25= 6_GUID: + if uuid.UUID(bytes_le =3D Header.HashType) !=3D EFI_HASH_ALGORITHM_SHA= 256_GUID: print('ERROR: unsupport hash GUID') sys.exit(1) =20 # # Verify the public key # - if Header.PublicKey <> PublicKey: + if Header.PublicKey !=3D PublicKey: print('ERROR: Public key in input file does not match public key fro= m private key file') sys.exit(1) =20 @@ -228,7 +228,7 @@ if __name__ =3D=3D '__main__': # =20 Process =3D subprocess.Popen('%s dgst -sha256 -prverify "%s" -signatur= e %s' % (OpenSslCommand, args.PrivateKeyFileName, args.OutputFileName), std= in=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, s= hell=3DTrue) Process.communicate(input=3DFullInputFileBuffer) - if Process.returncode <> 0: + if Process.returncode !=3D 0: print('ERROR: Verification failed') os.remove (args.OutputFileName) sys.exit(Process.returncode) diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 7f289c103fb9..a80c07bc1e55 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -2153,7 +2153,7 @@ class DscBuildData(PlatformBuildClassObject): 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 <> 0: + if returncode !=3D 0: EdkLogger.warn('Build', COMMAND_FAILURE, 'Can not collect = output from command: %s' % Command) =20 File =3D open (OutputValueFile, 'r') --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556280804151.63825012983068; Wed, 20 Jun 2018 21:44:40 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 804F6211D506B; Wed, 20 Jun 2018 21:44:27 -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 083D3211D5065 for ; Wed, 20 Jun 2018 21:44:24 -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:21 +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:31 +0800 Message-Id: <20180621044346.28495-6-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 05/20] BaseTools: Use the python3-range functions 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" Replace xrange() and range() with the newer range() function Based on "futurize -f libfuturize.fixes.fix_xrange_with_import" Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Scripts/BinToPcd.py = | 3 ++- BaseTools/Scripts/ConvertMasmToNasm.py = | 1 + BaseTools/Scripts/FormatDosFiles.py = | 3 ++- BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py = | 1 + BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/efibin= ary.py | 1 + BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py= | 1 + BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxyg= engen.py | 3 ++- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxyg= engen_spec.py | 3 ++- BaseTools/Scripts/PatchCheck.py = | 5 +++-- BaseTools/Source/Python/AutoGen/AutoGen.py = | 1 + BaseTools/Source/Python/AutoGen/BuildEngine.py = | 1 + BaseTools/Source/Python/AutoGen/GenC.py = | 1 + BaseTools/Source/Python/AutoGen/GenPcdDb.py = | 23 ++++++++++---------- BaseTools/Source/Python/AutoGen/GenVar.py = | 3 ++- BaseTools/Source/Python/AutoGen/InfSectionParser.py = | 1 + BaseTools/Source/Python/AutoGen/StrGather.py = | 1 + BaseTools/Source/Python/AutoGen/UniClassObject.py = | 1 + BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py = | 1 + BaseTools/Source/Python/BPDG/GenVpd.py = | 7 +++--- BaseTools/Source/Python/Common/Expression.py = | 1 + BaseTools/Source/Python/Common/Misc.py = | 3 ++- BaseTools/Source/Python/Common/Parsing.py = | 1 + BaseTools/Source/Python/Common/RangeExpression.py = | 1 + BaseTools/Source/Python/Common/StringUtils.py = | 1 + BaseTools/Source/Python/Common/ToolDefClassObject.py = | 1 + BaseTools/Source/Python/Ecc/Check.py = | 1 + BaseTools/Source/Python/Ecc/MetaDataParser.py = | 3 ++- BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py = | 1 + BaseTools/Source/Python/Eot/Eot.py = | 1 + BaseTools/Source/Python/Eot/InfParserLite.py = | 1 + BaseTools/Source/Python/GenFds/AprioriSection.py = | 1 + BaseTools/Source/Python/GenFds/FfsFileStatement.py = | 1 + BaseTools/Source/Python/GenFds/Fv.py = | 1 + BaseTools/Source/Python/GenFds/GenFds.py = | 1 + BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py = | 1 + BaseTools/Source/Python/GenFds/Region.py = | 3 ++- BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py = | 1 + BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py = | 3 ++- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py = | 3 ++- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py = | 3 ++- BaseTools/Source/Python/Trim/Trim.py = | 1 + BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py = | 5 +++-- BaseTools/Source/Python/UPT/Library/CommentParsing.py = | 3 ++- BaseTools/Source/Python/UPT/Library/Misc.py = | 5 +++-- BaseTools/Source/Python/UPT/Library/Parsing.py = | 3 ++- BaseTools/Source/Python/UPT/Library/StringUtils.py = | 1 + BaseTools/Source/Python/UPT/Library/UniClassObject.py = | 3 ++- BaseTools/Source/Python/UPT/Parser/DecParserMisc.py = | 1 + BaseTools/Source/Python/UPT/Parser/InfSectionParser.py = | 3 ++- BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py = | 1 + BaseTools/Source/Python/UPT/UPT.py = | 1 + BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py = | 1 + BaseTools/Source/Python/UPT/Xml/IniToXml.py = | 1 + BaseTools/Source/Python/UPT/Xml/XmlParser.py = | 1 + BaseTools/Source/Python/UPT/Xml/XmlParserMisc.py = | 3 ++- BaseTools/Source/Python/Workspace/DscBuildData.py = | 1 + BaseTools/Source/Python/Workspace/InfBuildData.py = | 1 + BaseTools/Source/Python/Workspace/MetaFileParser.py = | 1 + BaseTools/Tests/TestTools.py = | 3 ++- BaseTools/Tests/TianoCompress.py = | 1 + BaseTools/gcc/mingw-gcc-build.py = | 1 + 61 files changed, 98 insertions(+), 37 deletions(-) diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py index 10b5043325cc..88c46c35aa33 100644 --- a/BaseTools/Scripts/BinToPcd.py +++ b/BaseTools/Scripts/BinToPcd.py @@ -16,6 +16,7 @@ BinToPcd ''' from __future__ import print_function =20 +from builtins import range import sys import argparse import re @@ -100,7 +101,7 @@ if __name__ =3D=3D '__main__': help =3D "Increase output messages") parser.add_argument ("-q", "--quiet", dest =3D 'Quiet', action =3D "st= ore_true", help =3D "Reduce output messages") - parser.add_argument ("--debug", dest =3D 'Debug', type =3D int, metava= r =3D '[0-9]', choices =3D range (0, 10), default =3D 0, + parser.add_argument ("--debug", dest =3D 'Debug', type =3D int, metava= r =3D '[0-9]', choices =3D list(range(0, 10)), default =3D 0, help =3D "Set debug level") =20 # diff --git a/BaseTools/Scripts/ConvertMasmToNasm.py b/BaseTools/Scripts/Con= vertMasmToNasm.py index 5b83724b3124..e7b5b096fccc 100755 --- a/BaseTools/Scripts/ConvertMasmToNasm.py +++ b/BaseTools/Scripts/ConvertMasmToNasm.py @@ -17,6 +17,7 @@ from __future__ import print_function # # Import Modules # +from builtins import range import argparse import io import os.path diff --git a/BaseTools/Scripts/FormatDosFiles.py b/BaseTools/Scripts/Format= DosFiles.py index 3b16af5a4413..ce9d829ee430 100644 --- a/BaseTools/Scripts/FormatDosFiles.py +++ b/BaseTools/Scripts/FormatDosFiles.py @@ -17,6 +17,7 @@ # Import Modules # from __future__ import print_function +from builtins import range import argparse import os import os.path @@ -75,7 +76,7 @@ if __name__ =3D=3D "__main__": help=3D'increase output messages') parser.add_argument('-q', '--quiet', dest=3D'Quiet', action=3D'store_t= rue', help=3D'reduce output messages') - parser.add_argument('--debug', dest=3D'Debug', type=3Dint, metavar=3D'= [0-9]', choices=3Drange(0, 10), default=3D0, + 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('--exclude', dest=3D'Exclude', nargs=3D'+', help= =3D"directory name or file name which will be excluded") args =3D parser.parse_args() diff --git a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py b/Bas= eTools/Scripts/PackageDocumentTools/packagedoc_cli.py index 4deeee01a5e8..b45b5e69bc54 100644 --- a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py +++ b/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py @@ -13,6 +13,7 @@ # =20 from __future__ import print_function +from builtins import range import os, sys, logging, traceback, subprocess from optparse import OptionParser =20 diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/efibinary.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlug= ins/basemodel/efibinary.py index 290287b817e7..5e5f6526d3a6 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/e= fibinary.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/e= fibinary.py @@ -12,6 +12,7 @@ # =20 from __future__ import print_function +from builtins import range import array import uuid import re diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/ini.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/ba= semodel/ini.py index ea83327052f2..d7a4a3e4c42a 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/i= ni.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/i= ni.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from builtins import range from message import * import re import os diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2= /model/doxygengen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPl= ugins/edk2/model/doxygengen.py index c22d362ff3e1..f5562a05b426 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py @@ -16,6 +16,7 @@ """This file produce action class to generate doxygen document for edk2 co= debase. The action classes are shared by GUI and command line tools. """ +from builtins import range import plugins.EdkPlugins.basemodel.doxygen as doxygen import os try: @@ -386,7 +387,7 @@ class PackageDocumentAction(DoxygenAction): configFile.AddFile(path) =20 no =3D 0 - for no in xrange(len(lines)): + for no in range(len(lines)): if len(lines[no].strip()) =3D=3D 0: continue if lines[no].strip()[:2] in ['##', '//', '/*', '*/']: diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2= /model/doxygengen_spec.py b/BaseTools/Scripts/PackageDocumentTools/plugins/= EdkPlugins/edk2/model/doxygengen_spec.py index 4bae6968a96e..b8446032aa77 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen_spec.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen_spec.py @@ -13,6 +13,7 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 +from builtins import range import plugins.EdkPlugins.basemodel.doxygen as doxygen import os try: @@ -388,7 +389,7 @@ class PackageDocumentAction(DoxygenAction): configFile.AddFile(path) return no =3D 0 - for no in xrange(len(lines)): + for no in range(len(lines)): if len(lines[no].strip()) =3D=3D 0: continue if lines[no].strip()[:2] in ['##', '//', '/*', '*/']: diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck= .py index 43bfc2495c6b..51d4adf08b60 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -15,6 +15,7 @@ =20 from __future__ import print_function =20 +from builtins import range VersionNumber =3D '0.1' __copyright__ =3D "Copyright (c) 2015 - 2016, Intel Corporation All right= s reserved." =20 @@ -26,7 +27,7 @@ import subprocess import sys =20 class Verbose: - SILENT, ONELINE, NORMAL =3D range(3) + SILENT, ONELINE, NORMAL =3D list(range(3)) level =3D NORMAL =20 class CommitMessageCheck: @@ -234,7 +235,7 @@ class CommitMessageCheck: break last_sig_line =3D line.strip() =20 -(START, PRE_PATCH, PATCH) =3D range(3) +(START, PRE_PATCH, PATCH) =3D list(range(3)) =20 class GitDiffCheck: """Checks the contents of a git diff.""" diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index d7485909414d..cfe3b8118716 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -16,6 +16,7 @@ ## Import Modules # from __future__ import print_function +from builtins import range import Common.LongFilePathOs as os import re import os.path as path diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Sou= rce/Python/AutoGen/BuildEngine.py index cab4c993dc44..4d81ffa3436f 100644 --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py @@ -15,6 +15,7 @@ # Import Modules # from __future__ import print_function +from builtins import range import Common.LongFilePathOs as os import re import copy diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Pyt= hon/AutoGen/GenC.py index ae3af085a16b..2f10b3787a2d 100644 --- a/BaseTools/Source/Python/AutoGen/GenC.py +++ b/BaseTools/Source/Python/AutoGen/GenC.py @@ -13,6 +13,7 @@ =20 ## Import Modules # +from builtins import range import string import collections import struct diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source= /Python/AutoGen/GenPcdDb.py index 25e4f7246e3a..d2958384a97f 100644 --- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py +++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py @@ -10,6 +10,7 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # +from builtins import range from StringIO import StringIO from Common.Misc import * from Common.StringUtils import StringToArray @@ -257,7 +258,7 @@ class DbItemList: # Variable length, need to calculate one by one # assert(Index < len(self.RawDataList)) - for ItemIndex in xrange(Index): + for ItemIndex in range(Index): Offset +=3D len(self.RawDataList[ItemIndex]) else: Offset =3D self.ItemSize * Index @@ -344,7 +345,7 @@ class DbComItemList (DbItemList): assert(False) else: assert(Index < len(self.RawDataList)) - for ItemIndex in xrange(Index): + for ItemIndex in range(Index): Offset +=3D len(self.RawDataList[ItemIndex]) * self.ItemSi= ze =20 =20 return Offset @@ -410,7 +411,7 @@ class DbStringHeadTableItemList(DbItemList): # Variable length, need to calculate one by one # assert(Index < len(self.RawDataList)) - for ItemIndex in xrange(Index): + for ItemIndex in range(Index): Offset +=3D len(self.RawDataList[ItemIndex]) else: for innerIndex in range(Index): @@ -494,14 +495,14 @@ class DbStringItemList (DbComItemList): assert(len(RawDataList) =3D=3D len(LenList)) DataList =3D [] # adjust DataList according to the LenList - for Index in xrange(len(RawDataList)): + for Index in range(len(RawDataList)): Len =3D LenList[Index] RawDatas =3D RawDataList[Index] assert(Len >=3D len(RawDatas)) ActualDatas =3D [] - for i in xrange(len(RawDatas)): + for i in range(len(RawDatas)): ActualDatas.append(RawDatas[i]) - for i in xrange(len(RawDatas), Len): + for i in range(len(RawDatas), Len): ActualDatas.append(0) DataList.append(ActualDatas) self.LenList =3D LenList @@ -510,7 +511,7 @@ class DbStringItemList (DbComItemList): Offset =3D 0 =20 assert(Index < len(self.LenList)) - for ItemIndex in xrange(Index): + for ItemIndex in range(Index): Offset +=3D self.LenList[ItemIndex] =20 return Offset @@ -698,7 +699,7 @@ def BuildExDataBase(Dict): =20 # Get offset of SkuId table in the database=20 SkuIdTableOffset =3D FixedHeaderLen - for DbIndex in xrange(len(DbTotal)): + for DbIndex in range(len(DbTotal)): if DbTotal[DbIndex] is SkuidValue: break SkuIdTableOffset +=3D DbItemTotal[DbIndex].GetListSize() @@ -710,7 +711,7 @@ def BuildExDataBase(Dict): for (LocalTokenNumberTableIndex, (Offset, Table)) in enumerate(LocalTo= kenNumberTable): DbIndex =3D 0 DbOffset =3D FixedHeaderLen - for DbIndex in xrange(len(DbTotal)): + for DbIndex in range(len(DbTotal)): if DbTotal[DbIndex] is Table: DbOffset +=3D DbItemTotal[DbIndex].GetInterOffset(Offset) break @@ -736,7 +737,7 @@ def BuildExDataBase(Dict): (VariableHeadGuidIndex, VariableHeadStringIndex, SKUVariableOf= fset, VariableOffset, VariableRefTable, VariableAttribute) =3D VariableEntr= yPerSku[:] DbIndex =3D 0 DbOffset =3D FixedHeaderLen - for DbIndex in xrange(len(DbTotal)): + for DbIndex in range(len(DbTotal)): if DbTotal[DbIndex] is VariableRefTable: DbOffset +=3D DbItemTotal[DbIndex].GetInterOffset(Vari= ableOffset) break @@ -756,7 +757,7 @@ def BuildExDataBase(Dict): =20 # calculate various table offset now DbTotalLength =3D FixedHeaderLen - for DbIndex in xrange(len(DbItemTotal)): + for DbIndex in range(len(DbItemTotal)): if DbItemTotal[DbIndex] is DbLocalTokenNumberTable: LocalTokenNumberTableOffset =3D DbTotalLength elif DbItemTotal[DbIndex] is DbExMapTable: diff --git a/BaseTools/Source/Python/AutoGen/GenVar.py b/BaseTools/Source/P= ython/AutoGen/GenVar.py index 3675be8de994..faaa955431d5 100644 --- a/BaseTools/Source/Python/AutoGen/GenVar.py +++ b/BaseTools/Source/Python/AutoGen/GenVar.py @@ -14,6 +14,7 @@ # # # Import Modules # +from builtins import range from struct import pack,unpack import collections import copy @@ -92,7 +93,7 @@ class VariableMgr(object): for current_valuedict_key in ordered_valuedict_keys: if current_valuedict_key < len(var_value): raise - for _ in xrange(current_valuedict_key - len(var_value)): + for _ in range(current_valuedict_key - len(var_value)): var_value.append('0x00') var_value +=3D valuedict[current_valuedict_key] return var_value diff --git a/BaseTools/Source/Python/AutoGen/InfSectionParser.py b/BaseTool= s/Source/Python/AutoGen/InfSectionParser.py index 2cd5a6667a02..3d74e91f1f78 100644 --- a/BaseTools/Source/Python/AutoGen/InfSectionParser.py +++ b/BaseTools/Source/Python/AutoGen/InfSectionParser.py @@ -14,6 +14,7 @@ ## Import Modules # =20 +from builtins import range import Common.EdkLogger as EdkLogger from Common.BuildToolError import * from Common.DataType import * diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Sourc= e/Python/AutoGen/StrGather.py index ce8866f480d5..844d2d8d8856 100644 --- a/BaseTools/Source/Python/AutoGen/StrGather.py +++ b/BaseTools/Source/Python/AutoGen/StrGather.py @@ -14,6 +14,7 @@ ## # Import Modules # +from builtins import range import re import Common.EdkLogger as EdkLogger from Common.BuildToolError import * diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/= Source/Python/AutoGen/UniClassObject.py index 3a931c6f2766..438f3394d55b 100644 --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py @@ -17,6 +17,7 @@ # Import Modules # from __future__ import print_function +from builtins import range import Common.LongFilePathOs as os, codecs, re import distutils.util import Common.EdkLogger as EdkLogger diff --git a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py b/B= aseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py index 64d4965e9662..20356c6bcfab 100644 --- a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py +++ b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py @@ -14,6 +14,7 @@ # # # Import Modules # +from builtins import range import os from Common.RangeExpression import RangeExpression from Common.Misc import * diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/Source/Pyth= on/BPDG/GenVpd.py index 69a9665f5a76..999cadf3437d 100644 --- a/BaseTools/Source/Python/BPDG/GenVpd.py +++ b/BaseTools/Source/Python/BPDG/GenVpd.py @@ -13,6 +13,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IM= PLIED. # =20 +from builtins import range import Common.LongFilePathOs as os import StringIO import StringTable as st @@ -229,7 +230,7 @@ class PcdEntry: =20 ReturnArray =3D array.array('B') =20 - for Index in xrange(len(ValueList)): + for Index in range(len(ValueList)): Value =3D None if ValueList[Index].lower().startswith('0x'): # translate hex value @@ -255,7 +256,7 @@ class PcdEntry: =20 ReturnArray.append(Value) =20 - for Index in xrange(len(ValueList), Size): + for Index in range(len(ValueList), Size): ReturnArray.append(0) =20 self.PcdValue =3D ReturnArray.tolist() @@ -290,7 +291,7 @@ class PcdEntry: "Invalid unicode character %s in unicode s= tring %s(File: %s Line: %s)" % \ (Value, UnicodeString, self.FileName, self= .Lineno)) =20 - for Index in xrange(len(UnicodeString) * 2, Size): + for Index in range(len(UnicodeString) * 2, Size): ReturnArray.append(0) =20 self.PcdValue =3D ReturnArray.tolist() diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Sourc= e/Python/Common/Expression.py index c63030a16e6e..a4afe1783e33 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -13,6 +13,7 @@ ## Import Modules # from __future__ import print_function +from builtins import range from Common.GlobalData import * from CommonDataClass.Exceptions import BadExpression from CommonDataClass.Exceptions import WrnExpression diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Pyth= on/Common/Misc.py index 01171adb9b9e..ebf706a55d7e 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -14,6 +14,7 @@ ## # Import Modules # +from builtins import range import Common.LongFilePathOs as os import sys import string @@ -1634,7 +1635,7 @@ def SplitOption(OptionString): def CommonPath(PathList): P1 =3D min(PathList).split(os.path.sep) P2 =3D max(PathList).split(os.path.sep) - for Index in xrange(min(len(P1), len(P2))): + for Index in range(min(len(P1), len(P2))): if P1[Index] !=3D P2[Index]: return os.path.sep.join(P1[:Index]) return os.path.sep.join(P1) diff --git a/BaseTools/Source/Python/Common/Parsing.py b/BaseTools/Source/P= ython/Common/Parsing.py index 527852a50c09..717bc569d1c9 100644 --- a/BaseTools/Source/Python/Common/Parsing.py +++ b/BaseTools/Source/Python/Common/Parsing.py @@ -14,6 +14,7 @@ ## # Import Modules # +from builtins import range from StringUtils import * from CommonDataClass.DataClass import * from DataType import * diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/= Source/Python/Common/RangeExpression.py index 4c29bc9ee4bd..284ee9c16334 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -13,6 +13,7 @@ # # Import Modules # from __future__ import print_function +from builtins import range from Common.GlobalData import * from CommonDataClass.Exceptions import BadExpression from CommonDataClass.Exceptions import WrnExpression diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Sour= ce/Python/Common/StringUtils.py index 2292a263b985..833bdcf5614b 100644 --- a/BaseTools/Source/Python/Common/StringUtils.py +++ b/BaseTools/Source/Python/Common/StringUtils.py @@ -14,6 +14,7 @@ ## # Import Modules # +from builtins import range import re import DataType import Common.LongFilePathOs as os diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseToo= ls/Source/Python/Common/ToolDefClassObject.py index dd985ab30359..3a1cb13ff690 100644 --- a/BaseTools/Source/Python/Common/ToolDefClassObject.py +++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py @@ -14,6 +14,7 @@ ## # Import Modules # +from builtins import range import Common.LongFilePathOs as os import re import EdkLogger diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python= /Ecc/Check.py index ea739043e0bc..4a60e9bab0e4 100644 --- a/BaseTools/Source/Python/Ecc/Check.py +++ b/BaseTools/Source/Python/Ecc/Check.py @@ -10,6 +10,7 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # +from builtins import range import Common.LongFilePathOs as os import re from CommonDataClass.DataClass import * diff --git a/BaseTools/Source/Python/Ecc/MetaDataParser.py b/BaseTools/Sour= ce/Python/Ecc/MetaDataParser.py index 82ede3eb330c..9b8b96aa4b43 100644 --- a/BaseTools/Source/Python/Ecc/MetaDataParser.py +++ b/BaseTools/Source/Python/Ecc/MetaDataParser.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from builtins import range import Common.LongFilePathOs as os from CommonDataClass.DataClass import * from EccToolError import * @@ -112,7 +113,7 @@ def ParseHeaderCommentSection(CommentList, FileName =3D= None): # Last =3D 0 HeaderCommentStage =3D HEADER_COMMENT_NOT_STARTED - for Index in xrange(len(CommentList)-1, 0, -1): + for Index in range(len(CommentList)-1, 0, -1): Line =3D CommentList[Index][0] if _IsCopyrightLine(Line): Last =3D Index diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.p= y b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py index fd96bb9a3c0b..d22945434711 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py @@ -14,6 +14,7 @@ ## # Import Modules # +from builtins import range import Common.LongFilePathOs as os import re import time diff --git a/BaseTools/Source/Python/Eot/Eot.py b/BaseTools/Source/Python/E= ot/Eot.py index dfd1146af749..1862d71f7342 100644 --- a/BaseTools/Source/Python/Eot/Eot.py +++ b/BaseTools/Source/Python/Eot/Eot.py @@ -14,6 +14,7 @@ ## # Import Modules # +from builtins import range import Common.LongFilePathOs as os, time, glob import Common.EdkLogger as EdkLogger import EotGlobalData diff --git a/BaseTools/Source/Python/Eot/InfParserLite.py b/BaseTools/Sourc= e/Python/Eot/InfParserLite.py index 24f0d50246e5..5a2eab9b0413 100644 --- a/BaseTools/Source/Python/Eot/InfParserLite.py +++ b/BaseTools/Source/Python/Eot/InfParserLite.py @@ -15,6 +15,7 @@ # Import Modules # from __future__ import print_function +from builtins import range import Common.LongFilePathOs as os import Common.EdkLogger as EdkLogger from Common.DataType import * diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/S= ource/Python/GenFds/AprioriSection.py index 6b81b42620d7..decc0dd7c98d 100644 --- a/BaseTools/Source/Python/GenFds/AprioriSection.py +++ b/BaseTools/Source/Python/GenFds/AprioriSection.py @@ -15,6 +15,7 @@ ## # Import Modules # +from builtins import range from struct import * import Common.LongFilePathOs as os import StringIO diff --git a/BaseTools/Source/Python/GenFds/FfsFileStatement.py b/BaseTools= /Source/Python/GenFds/FfsFileStatement.py index ba8e0465ef34..c3bccb47be2c 100644 --- a/BaseTools/Source/Python/GenFds/FfsFileStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsFileStatement.py @@ -15,6 +15,7 @@ ## # Import Modules # +from builtins import range import Ffs import Rule import Common.LongFilePathOs as os diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python= /GenFds/Fv.py index 6714838f6fc9..21c2579f0b51 100644 --- a/BaseTools/Source/Python/GenFds/Fv.py +++ b/BaseTools/Source/Python/GenFds/Fv.py @@ -15,6 +15,7 @@ ## # Import Modules # +from builtins import range import Common.LongFilePathOs as os import subprocess import StringIO diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Py= thon/GenFds/GenFds.py index 1552ab4ee3a8..6b6511915eb3 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -16,6 +16,7 @@ # Import Modules # from __future__ import print_function +from builtins import range from optparse import OptionParser import sys import Common.LongFilePathOs as os diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseT= ools/Source/Python/GenFds/GenFdsGlobalVariable.py index 73b52030d929..3388d5b098a8 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -16,6 +16,7 @@ # Import Modules # from __future__ import print_function +from builtins import range import Common.LongFilePathOs as os import sys import subprocess diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Py= thon/GenFds/Region.py index 9d632b6321e2..a662692ad5d4 100644 --- a/BaseTools/Source/Python/GenFds/Region.py +++ b/BaseTools/Source/Python/GenFds/Region.py @@ -15,6 +15,7 @@ ## # Import Modules # +from builtins import range from struct import * from GenFdsGlobalVariable import GenFdsGlobalVariable import StringIO @@ -57,7 +58,7 @@ class Region(RegionClassObject): PadByte =3D pack('B', 0xFF) else: PadByte =3D pack('B', 0) - PadData =3D ''.join(PadByte for i in xrange(0, Size)) + PadData =3D ''.join(PadByte for i in range(0, Size)) Buffer.write(PadData) =20 ## AddToBuffer() diff --git a/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py b/BaseT= ools/Source/Python/PatchPcdValue/PatchPcdValue.py index cf2fc7c4f70a..0ba4a94950c6 100644 --- a/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py +++ b/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py @@ -14,6 +14,7 @@ ## # Import Modules # +from builtins import range import Common.LongFilePathOs as os from Common.LongFilePathSupport import OpenLongFilePath as open import sys diff --git a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py b/BaseTools/Sou= rce/Python/Pkcs7Sign/Pkcs7Sign.py index 11d11700ed99..becf3e8eb9e8 100644 --- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py +++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py @@ -21,6 +21,7 @@ Pkcs7Sign ''' from __future__ import print_function =20 +from builtins import range import os import sys import argparse @@ -88,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=3Drange(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 ca4f64864790..ca0093bf117e 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py @@ -24,6 +24,7 @@ Rsa2048Sha256GenerateKeys ''' from __future__ import print_function =20 +from builtins import range import os import sys import argparse=20 @@ -51,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=3Drange(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 2e164c4a2da6..ff9721d0deae 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py @@ -19,6 +19,7 @@ Rsa2048Sha256Sign ''' from __future__ import print_function =20 +from builtins import range import os import sys import argparse=20 @@ -71,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=3Drange(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/Trim/Trim.py b/BaseTools/Source/Python= /Trim/Trim.py index b512d15243f8..1a690cde5933 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -14,6 +14,7 @@ ## # Import Modules # +from builtins import range import Common.LongFilePathOs as os import sys import re diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTo= ols/Source/Python/UPT/GenMetaFile/GenInfFile.py index bfd422b196ba..448b85700948 100644 --- a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py +++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py @@ -15,6 +15,7 @@ ''' GenInf ''' +from builtins import range import os import stat import codecs @@ -409,7 +410,7 @@ def GenLibraryClasses(ModuleObject): Statement +=3D '|' + FFE ModuleList =3D LibraryClass.GetSupModuleList() ArchList =3D LibraryClass.GetSupArchList() - for Index in xrange(0, len(ArchList)): + for Index in range(0, len(ArchList)): ArchList[Index] =3D ConvertArchForInstall(ArchList[Index]) ArchList.sort() SortedArch =3D ' '.join(ArchList) @@ -574,7 +575,7 @@ def GenUserExtensions(ModuleObject): # if not Statement: # continue ArchList =3D UserExtension.GetSupArchList() - for Index in xrange(0, len(ArchList)): + for Index in range(0, len(ArchList)): ArchList[Index] =3D ConvertArchForInstall(ArchList[Index]) ArchList.sort() KeyList =3D [] diff --git a/BaseTools/Source/Python/UPT/Library/CommentParsing.py b/BaseTo= ols/Source/Python/UPT/Library/CommentParsing.py index 8ee788bd7724..3ad69ebc1902 100644 --- a/BaseTools/Source/Python/UPT/Library/CommentParsing.py +++ b/BaseTools/Source/Python/UPT/Library/CommentParsing.py @@ -19,6 +19,7 @@ CommentParsing ## # Import Modules # +from builtins import range import re =20 from Library.StringUtils import GetSplitValueList @@ -74,7 +75,7 @@ def ParseHeaderCommentSection(CommentList, FileName =3D N= one, IsBinaryHeader =3D Fal # first find the last copyright line # Last =3D 0 - for Index in xrange(len(CommentList)-1, 0, -1): + for Index in range(len(CommentList)-1, 0, -1): Line =3D CommentList[Index][0] if _IsCopyrightLine(Line): Last =3D Index diff --git a/BaseTools/Source/Python/UPT/Library/Misc.py b/BaseTools/Source= /Python/UPT/Library/Misc.py index e16d309ef883..733abc6ff5de 100644 --- a/BaseTools/Source/Python/UPT/Library/Misc.py +++ b/BaseTools/Source/Python/UPT/Library/Misc.py @@ -19,6 +19,7 @@ Misc ## # Import Modules # +from builtins import range import os.path from os import access from os import F_OK @@ -437,7 +438,7 @@ class Sdict(IterableUserDict): def CommonPath(PathList): Path1 =3D min(PathList).split(os.path.sep) Path2 =3D max(PathList).split(os.path.sep) - for Index in xrange(min(len(Path1), len(Path2))): + for Index in range(min(len(Path1), len(Path2))): if Path1[Index] !=3D Path2[Index]: return os.path.sep.join(Path1[:Index]) return os.path.sep.join(Path1) @@ -890,7 +891,7 @@ def ProcessEdkComment(LineList): if FindEdkBlockComment: if FirstPos =3D=3D -1: FirstPos =3D StartPos - for Index in xrange(StartPos, EndPos+1): + for Index in range(StartPos, EndPos+1): LineList[Index] =3D '' FindEdkBlockComment =3D False elif Line.find("//") !=3D -1 and not Line.startswith("#"): diff --git a/BaseTools/Source/Python/UPT/Library/Parsing.py b/BaseTools/Sou= rce/Python/UPT/Library/Parsing.py index 22030e7587c1..22faabfa4bb0 100644 --- a/BaseTools/Source/Python/UPT/Library/Parsing.py +++ b/BaseTools/Source/Python/UPT/Library/Parsing.py @@ -20,6 +20,7 @@ Parsing ## # Import Modules # +from builtins import range import os.path import re =20 @@ -973,7 +974,7 @@ def GenSection(SectionName, SectionDict, SplitArch=3DTr= ue, NeedBlankLine=3DFalse): ArchList =3D GetSplitValueList(SectionAttrs, DataType.= TAB_COMMENT_SPLIT) else: ArchList =3D [SectionAttrs] - for Index in xrange(0, len(ArchList)): + for Index in range(0, len(ArchList)): ArchList[Index] =3D ConvertArchForInstall(ArchList[Index]) Section =3D '[' + SectionName + '.' + (', ' + SectionName + '.= ').join(ArchList) + ']' else: diff --git a/BaseTools/Source/Python/UPT/Library/StringUtils.py b/BaseTools= /Source/Python/UPT/Library/StringUtils.py index a7a7b8667143..dccaff744617 100644 --- a/BaseTools/Source/Python/UPT/Library/StringUtils.py +++ b/BaseTools/Source/Python/UPT/Library/StringUtils.py @@ -18,6 +18,7 @@ StringUtils ## # Import Modules # +from builtins import range import re import os.path from string import strip diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTo= ols/Source/Python/UPT/Library/UniClassObject.py index a464cbf702f7..7e4362fd8ddd 100644 --- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py +++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py @@ -19,6 +19,7 @@ from __future__ import print_function ## # Import Modules # +from builtins import range import os, codecs, re import distutils.util from Logger import ToolError @@ -513,7 +514,7 @@ class UniFileClassObject(object): FileIn[LineCount-1] =3D Line FileIn[LineCount] =3D '\r\n' LineCount -=3D 1 - for Index in xrange (LineCount + 1, len (FileIn) - 1): + for Index in range (LineCount + 1, len (FileIn) - 1): if (Index =3D=3D len(FileIn) -1): FileIn[Index] =3D '\r\n' else: diff --git a/BaseTools/Source/Python/UPT/Parser/DecParserMisc.py b/BaseTool= s/Source/Python/UPT/Parser/DecParserMisc.py index 22a50680fb8f..14539b0bd6c1 100644 --- a/BaseTools/Source/Python/UPT/Parser/DecParserMisc.py +++ b/BaseTools/Source/Python/UPT/Parser/DecParserMisc.py @@ -17,6 +17,7 @@ DecParserMisc =20 ## Import modules # +from builtins import range import os import Logger.Log as Logger from Logger.ToolError import FILE_PARSE_FAILURE diff --git a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py b/BaseT= ools/Source/Python/UPT/Parser/InfSectionParser.py index 8ba4c3fc0819..9e0a74c31d75 100644 --- a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py +++ b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py @@ -18,6 +18,7 @@ InfSectionParser ## # Import Modules # +from builtins import range from copy import deepcopy import re =20 @@ -455,7 +456,7 @@ class InfSectionParser(InfDefinSectionParser, Arch =3D Match.groups(1)[0].upper() ArchList.append(Arch) CommentSoFar =3D '' - for Index in xrange(1, len(List)): + for Index in range(1, len(List)): Result =3D ParseComment(List[Index], DT.ALL_USAGE_TOKENS, = TokenDict, [], False) Usage =3D Result[0] Type =3D Result[1] diff --git a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py b/Ba= seTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py index 074aa311f31d..4c28b7f5d22a 100644 --- a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py +++ b/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py @@ -20,6 +20,7 @@ from __future__ import print_function ## # Import Modules # +from builtins import range import os.path from os import sep import platform diff --git a/BaseTools/Source/Python/UPT/UPT.py b/BaseTools/Source/Python/U= PT/UPT.py index 2644dbed31e9..930f0c1b9d54 100644 --- a/BaseTools/Source/Python/UPT/UPT.py +++ b/BaseTools/Source/Python/UPT/UPT.py @@ -19,6 +19,7 @@ UPT =20 ## import modules # +from builtins import range import locale import sys encoding =3D locale.getdefaultlocale()[1] diff --git a/BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py b= /BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py index 626f17426de7..2c21823194e2 100644 --- a/BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py +++ b/BaseTools/Source/Python/UPT/UnitTest/InfBinarySectionTest.py @@ -12,6 +12,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. =20 from __future__ import print_function +from builtins import range import os #import Object.Parser.InfObject as InfObject from Object.Parser.InfCommonObject import CurrentLine diff --git a/BaseTools/Source/Python/UPT/Xml/IniToXml.py b/BaseTools/Source= /Python/UPT/Xml/IniToXml.py index aa6f23011b17..529668895eb3 100644 --- a/BaseTools/Source/Python/UPT/Xml/IniToXml.py +++ b/BaseTools/Source/Python/UPT/Xml/IniToXml.py @@ -16,6 +16,7 @@ IniToXml ''' =20 +from builtins import range import os.path import re from time import strftime diff --git a/BaseTools/Source/Python/UPT/Xml/XmlParser.py b/BaseTools/Sourc= e/Python/UPT/Xml/XmlParser.py index dba3b7f5892c..dccc7a88f1d9 100644 --- a/BaseTools/Source/Python/UPT/Xml/XmlParser.py +++ b/BaseTools/Source/Python/UPT/Xml/XmlParser.py @@ -19,6 +19,7 @@ XmlParser ## # Import Modules # +from builtins import range import re =20 from Library.Xml.XmlRoutines import XmlNode diff --git a/BaseTools/Source/Python/UPT/Xml/XmlParserMisc.py b/BaseTools/S= ource/Python/UPT/Xml/XmlParserMisc.py index 7e3dc94edf64..28b146ff9183 100644 --- a/BaseTools/Source/Python/UPT/Xml/XmlParserMisc.py +++ b/BaseTools/Source/Python/UPT/Xml/XmlParserMisc.py @@ -15,6 +15,7 @@ ''' XmlParserMisc ''' +from builtins import range from Object.POM.CommonObject import TextObject from Logger.StringTable import ERR_XML_PARSER_REQUIRED_ITEM_MISSING from Logger.ToolError import PARSER_ERROR @@ -53,7 +54,7 @@ def ConvertVariableName(VariableName): if SecondByte !=3D 0: return None =20 - if FirstByte not in xrange(0x20, 0x7F): + if FirstByte not in range(0x20, 0x7F): return None TransferedStr +=3D ('%c')%FirstByte Index =3D Index + 2 diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index a80c07bc1e55..462b06944a94 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -18,6 +18,7 @@ # into PlatformBuildClassObject form for easier use for AutoGen. # from __future__ import print_function +from builtins import range from Common.StringUtils import * from Common.DataType import * from Common.Misc import * diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/= Source/Python/Workspace/InfBuildData.py index 165e03f78964..658f86ac891c 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -12,6 +12,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from builtins import range from Common.StringUtils import * from Common.DataType import * from Common.Misc import * diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index 2815c83af1b3..baa5ddbb3917 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -16,6 +16,7 @@ # Import Modules # from __future__ import print_function +from builtins import range import Common.LongFilePathOs as os import re import time diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py index be7b4ad42856..37338fd60db7 100644 --- a/BaseTools/Tests/TestTools.py +++ b/BaseTools/Tests/TestTools.py @@ -16,6 +16,7 @@ from __future__ import print_function ## # Import Modules # +from builtins import range import base64 import os import os.path @@ -162,7 +163,7 @@ class BaseToolsTest(unittest.TestCase): if maxlen is None: maxlen =3D minlen return ''.join( [chr(random.randint(0,255)) - for x in xrange(random.randint(minlen, maxlen)) + for x in range(random.randint(minlen, maxlen)) ]) =20 def setUp(self): diff --git a/BaseTools/Tests/TianoCompress.py b/BaseTools/Tests/TianoCompre= ss.py index f6a4a6ae9c5d..65f783d1be9e 100644 --- a/BaseTools/Tests/TianoCompress.py +++ b/BaseTools/Tests/TianoCompress.py @@ -16,6 +16,7 @@ # Import Modules # from __future__ import print_function +from builtins import range import os import random import sys diff --git a/BaseTools/gcc/mingw-gcc-build.py b/BaseTools/gcc/mingw-gcc-bui= ld.py index 643fec58a457..f7d0308bd9fa 100755 --- a/BaseTools/gcc/mingw-gcc-build.py +++ b/BaseTools/gcc/mingw-gcc-build.py @@ -18,6 +18,7 @@ =20 =20 from __future__ import print_function +from builtins import range from optparse import OptionParser import os import shutil --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556285532845.4094855978115; Wed, 20 Jun 2018 21:44:45 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B3AFB211D5070; Wed, 20 Jun 2018 21:44:28 -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 0820C211D506A for ; Wed, 20 Jun 2018 21:44:26 -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:23 +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:32 +0800 Message-Id: <20180621044346.28495-7-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 06/20] BaseTools: Remove tuple parameter in python scripts 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" According to PEP3113, tuple parameter is removed in python 3. (PEP3113: https://www.python.org/dev/peps/pep-3113/) Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Source/Python/Common/VpdInfoFile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Sour= ce/Python/Common/VpdInfoFile.py index 09b8196faf07..435b23f203a0 100644 --- a/BaseTools/Source/Python/Common/VpdInfoFile.py +++ b/BaseTools/Source/Python/Common/VpdInfoFile.py @@ -218,7 +218,8 @@ class VpdInfoFile: return None =20 return self._VpdArray[vpd] - def GetVpdInfo(self,(PcdTokenName,TokenSpaceName)): + def GetVpdInfo(self, arg): + (PcdTokenName, TokenSpaceName) =3D arg return self._VpdInfo.get((TokenSpaceName, PcdTokenName)) =20 ## Call external BPDG tool to process VPD file --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556290347385.78118320636645; Wed, 20 Jun 2018 21:44:50 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id DF926211D506F; Wed, 20 Jun 2018 21:44:30 -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 36CC6211D5074 for ; Wed, 20 Jun 2018 21:44:29 -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:25 +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:33 +0800 Message-Id: <20180621044346.28495-8-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 07/20] BaseTools: Remove the deprecated hash_key() 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" Replace "has_key()" with "in" to be compatible with python3. Based on "futurize -f lib2to3.fixes.fix_has_key" Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py= | 2 +- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseo= bject.py | 6 +++--- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.p= y | 8 ++++---- BaseTools/Source/Python/AutoGen/AutoGen.py = | 4 ++-- BaseTools/Source/Python/Common/VpdInfoFile.py = | 2 +- BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py = | 16 ++++++++-------- BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py = | 6 +++--- BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py = | 2 +- BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py = | 4 ++-- BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py = | 2 +- BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py = | 4 ++-- BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py = | 4 ++-- BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py = | 4 ++-- BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py = | 4 ++-- BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py = | 2 +- BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py = | 3 +-- BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py = | 4 ++-- BaseTools/Source/Python/build/build.py = | 2 +- 18 files changed, 39 insertions(+), 40 deletions(-) diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/ini.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/ba= semodel/ini.py index d7a4a3e4c42a..0e9b105b3647 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/i= ni.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/i= ni.py @@ -141,7 +141,7 @@ class BaseINIFile(object): sObj =3D self.GetSectionInstance(self, name, (len(snam= e_arr) > 1)) sObj._start =3D index sObjs.append(sObj) - if not self._sections.has_key(name.lower()): + if name.lower() not in self._sections: self._sections[name.lower()] =3D [sObj] else: self._sections[name.lower()].append(sObj) diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2= /model/baseobject.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPl= ugins/edk2/model/baseobject.py index 7c120d85c255..b49c87c8bdab 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= baseobject.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= baseobject.py @@ -26,7 +26,7 @@ class SurfaceObject(object): =20 """ obj =3D object.__new__(cls, *args, **kwargs) - if not cls._objs.has_key("None"): + if "None" not in cls._objs: cls._objs["None"] =3D [] cls._objs["None"].append(obj) =20 @@ -47,7 +47,7 @@ class SurfaceObject(object): self.GetFileObj().Destroy(self) del self._fileObj # dereference self from _objs arrary - assert self._objs.has_key(key), "when destory, object is not in ob= j list" + assert key in self._objs, "when destory, object is not in obj list" assert self in self._objs[key], "when destory, object is not in ob= j list" self._objs[key].remove(self) if len(self._objs[key]) =3D=3D 0: @@ -95,7 +95,7 @@ class SurfaceObject(object): if self not in cls._objs["None"]: ErrorMsg("Sufrace object does not be create into None list") cls._objs["None"].remove(self) - if not cls._objs.has_key(relativePath): + if relativePath not in cls._objs: cls._objs[relativePath] =3D [] cls._objs[relativePath].append(self) =20 diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2= /model/inf.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/e= dk2/model/inf.py index 32b26850e766..793e95efedcc 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= inf.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= inf.py @@ -61,7 +61,7 @@ class INFFile(ini.BaseINIFile): classname =3D self.GetProduceLibraryClass() if classname is not None: libobjdict =3D INFFile._libobjs - if libobjdict.has_key(classname): + if classname in libobjdict: if self not in libobjdict[classname]: libobjdict[classname].append(self) else: @@ -169,7 +169,7 @@ class INFLibraryClassObject(INFSectionObject): def Parse(self): self._classname =3D self.GetLineByOffset(self._start).split('#')[0= ].strip() objdict =3D INFLibraryClassObject._objs - if objdict.has_key(self._classname): + if self._classname in objdict: objdict[self._classname].append(self) else: objdict[self._classname] =3D [self] @@ -241,7 +241,7 @@ class INFSourceObject(INFSectionObject): =20 self.mFilename =3D os.path.basename(self.GetSourceFullPath()) objdict =3D INFSourceObject._objs - if not objdict.has_key(self.mFilename): + if self.mFilename not in objdict: objdict[self.mFilename] =3D [self] else: objdict[self.mFilename].append(self) @@ -303,7 +303,7 @@ class INFPcdObject(INFSectionObject): self.mDefaultValue =3D arr[1].strip() =20 objdict =3D INFPcdObject._objs - if objdict.has_key(self.GetName()): + if self.GetName() in objdict: if self not in objdict[self.GetName()]: objdict[self.GetName()].append(self) else: diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index cfe3b8118716..5626261b2cee 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -1799,8 +1799,8 @@ class PlatformAutoGen(AutoGen): # retrieve BPDG tool's path from tool_def.txt according to VPD= _TOOL_GUID defined in DSC file. BPDGToolName =3D None for ToolDef in self.ToolDefinition.values(): - if ToolDef.has_key(TAB_GUID) and ToolDef[TAB_GUID] =3D=3D = self.Platform.VpdToolGuid: - if not ToolDef.has_key("PATH"): + if TAB_GUID in ToolDef and ToolDef[TAB_GUID] =3D=3D self.P= latform.VpdToolGuid: + if "PATH" not in ToolDef: EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, = "PATH attribute was not provided for BPDG guid tool %s in tools_def.txt" % = self.Platform.VpdToolGuid) BPDGToolName =3D ToolDef["PATH"] break diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Sour= ce/Python/Common/VpdInfoFile.py index 435b23f203a0..ddabe9fb2546 100644 --- a/BaseTools/Source/Python/Common/VpdInfoFile.py +++ b/BaseTools/Source/Python/Common/VpdInfoFile.py @@ -211,7 +211,7 @@ class VpdInfoFile: # # @param vpd A given VPD PCD=20 def GetOffset(self, vpd): - if not self._VpdArray.has_key(vpd): + if vpd not in self._VpdArray: return None =20 if len(self._VpdArray[vpd]) =3D=3D 0: diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTo= ols/Source/Python/UPT/GenMetaFile/GenInfFile.py index 448b85700948..3d403ecbe09b 100644 --- a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py +++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py @@ -439,14 +439,14 @@ def GenLibraryClasses(ModuleObject): Statement =3D '# Guid: ' + LibraryItem.Guid + ' Version: '= + LibraryItem.Version =20 if len(BinaryFile.SupArchList) =3D=3D 0: - if LibraryClassDict.has_key('COMMON') and Statement no= t in LibraryClassDict['COMMON']: + if 'COMMON' in LibraryClassDict and Statement not in L= ibraryClassDict['COMMON']: LibraryClassDict['COMMON'].append(Statement) else: LibraryClassDict['COMMON'] =3D ['## @LIB_INSTANCES= '] LibraryClassDict['COMMON'].append(Statement) else: for Arch in BinaryFile.SupArchList: - if LibraryClassDict.has_key(Arch): + if Arch in LibraryClassDict: if Statement not in LibraryClassDict[Arch]: LibraryClassDict[Arch].append(Statement) else: @@ -918,14 +918,14 @@ def GenAsBuiltPacthPcdSections(ModuleObject): if FileNameObjList: ArchList =3D FileNameObjList[0].GetSupArchList() if len(ArchList) =3D=3D 0: - if PatchPcdDict.has_key(DT.TAB_ARCH_COMMON): + if DT.TAB_ARCH_COMMON in PatchPcdDict: if Statement not in PatchPcdDict[DT.TAB_ARCH_COMMON]: PatchPcdDict[DT.TAB_ARCH_COMMON].append(Statement) else: PatchPcdDict[DT.TAB_ARCH_COMMON] =3D [Statement] else: for Arch in ArchList: - if PatchPcdDict.has_key(Arch): + if Arch in PatchPcdDict: if Statement not in PatchPcdDict[Arch]: PatchPcdDict[Arch].append(Statement) else: @@ -968,13 +968,13 @@ def GenAsBuiltPcdExSections(ModuleObject): ArchList =3D FileNameObjList[0].GetSupArchList() =20 if len(ArchList) =3D=3D 0: - if PcdExDict.has_key('COMMON'): + if 'COMMON' in PcdExDict: PcdExDict['COMMON'].append(Statement) else: PcdExDict['COMMON'] =3D [Statement] else: for Arch in ArchList: - if PcdExDict.has_key(Arch): + if Arch in PcdExDict: if Statement not in PcdExDict[Arch]: PcdExDict[Arch].append(Statement) else: @@ -1072,7 +1072,7 @@ def GenBuildOptions(ModuleObject): for BuilOptionItem in BinaryFile.AsBuiltList[0].BinaryBuildFla= gList: Statement =3D '#' + BuilOptionItem.AsBuiltOptionFlags if len(BinaryFile.SupArchList) =3D=3D 0: - if BuildOptionDict.has_key('COMMON'): + if 'COMMON' in BuildOptionDict: if Statement not in BuildOptionDict['COMMON']: BuildOptionDict['COMMON'].append(Statement) else: @@ -1080,7 +1080,7 @@ def GenBuildOptions(ModuleObject): BuildOptionDict['COMMON'].append(Statement) else: for Arch in BinaryFile.SupArchList: - if BuildOptionDict.has_key(Arch): + if Arch in BuildOptionDict: if Statement not in BuildOptionDict[Arch]: BuildOptionDict[Arch].append(Statement) else: diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py b= /BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py index 33b142d64e07..cc2fc4905326 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py @@ -272,7 +272,7 @@ class InfBinariesObject(InfSectionCommonDef): pass =20 if InfBianryVerItemObj is not None: - if self.Binaries.has_key((InfBianryVerItemObj)): + if (InfBianryVerItemObj) in self.Binaries: BinariesList =3D self.Binaries[InfBianryVerItemObj] BinariesList.append((InfBianryVerItemObj, VerComment)) self.Binaries[InfBianryVerItemObj] =3D BinariesList @@ -522,7 +522,7 @@ class InfBinariesObject(InfSectionCommonDef): # pass =20 if InfBianryCommonItemObj is not None: - if self.Binaries.has_key((InfBianryCommonItemObj)): + if (InfBianryCommonItemObj) in self.Binaries: BinariesList =3D self.Binaries[InfBianryCommonItemObj] BinariesList.append((InfBianryCommonItemObj, ItemComme= nt)) self.Binaries[InfBianryCommonItemObj] =3D BinariesList @@ -673,7 +673,7 @@ class InfBinariesObject(InfSectionCommonDef): # pass =20 if InfBianryUiItemObj is not None: - if self.Binaries.has_key((InfBianryUiItemObj)): + if (InfBianryUiItemObj) in self.Binaries: BinariesList =3D self.Binaries[InfBianryUiItem= Obj] BinariesList.append((InfBianryUiItemObj, UiCom= ment)) self.Binaries[InfBianryUiItemObj] =3D Binaries= List diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py b= /BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py index 3995546593d8..9d27a92cd6b0 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py @@ -957,7 +957,7 @@ class InfDefObject(InfSectionCommonDef): SpecValue =3D Name[Name.find("SPEC") + len("SPEC"):].s= trip() Name =3D "SPEC" Value =3D SpecValue + " =3D " + Value - if self.Defines.has_key(ArchListString): + if ArchListString in self.Defines: DefineList =3D self.Defines[ArchListString] = =20 LineInfo[0] =3D InfDefMemberObj.CurrentLine.GetFileNam= e() LineInfo[1] =3D InfDefMemberObj.CurrentLine.GetLineNo() diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py b/B= aseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py index fb8d1f5a62ee..4dfe75a2f16a 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py @@ -338,7 +338,7 @@ class InfGuidObject(): # pass =20 - if self.Guids.has_key((InfGuidItemObj)): =20 + if (InfGuidItemObj) in self.Guids: GuidList =3D self.Guids[InfGuidItemObj] =20 GuidList.append(InfGuidItemObj) self.Guids[InfGuidItemObj] =3D GuidList @@ -350,4 +350,4 @@ class InfGuidObject(): return True =20 def GetGuid(self): - return self.Guids \ No newline at end of file + return self.Guids diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObj= ect.py b/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.= py index e588c6ba66d8..5de1832b71fa 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py @@ -238,7 +238,7 @@ class InfLibraryClassObject(): LibItemObj.SetVersion(LibItem[1]) LibItemObj.SetSupArchList(__SupArchList) =20 - if self.LibraryClasses.has_key((LibItemObj)): + if (LibItemObj) in self.LibraryClasses: LibraryList =3D self.LibraryClasses[LibItemObj] LibraryList.append(LibItemObj) self.LibraryClasses[LibItemObj] =3D LibraryList diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py b/BaseToo= ls/Source/Python/UPT/Object/Parser/InfMisc.py index 37f8cb2336bb..4ed739d66fb2 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py @@ -114,7 +114,7 @@ class InfSpecialCommentObject(InfSectionCommonDef): Type =3D=3D DT.TYPE_EVENT_SECTION or \ Type =3D=3D DT.TYPE_BOOTMODE_SECTION: for Item in SepcialSectionList: - if self.SpecialComments.has_key(Type): =20 + if Type in self.SpecialComments: ObjList =3D self.SpecialComments[Type] ObjList.append(Item) self.SpecialComments[Type] =3D ObjList @@ -145,4 +145,4 @@ def ErrorInInf(Message=3DNone, ErrorCode=3DNone, LineIn= fo=3DNone, RaiseError=3DTrue): File=3DLineInfo[0],=20 Line=3DLineInfo[1], ExtraData=3DLineInfo[2],=20 - RaiseError=3DRaiseError) \ No newline at end of file + RaiseError=3DRaiseError) diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py= b/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py index 01c854a8470e..bfac2b6b571c 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py @@ -171,7 +171,7 @@ class InfPackageObject(): # pass =20 - if self.Packages.has_key((PackageItemObj)): =20 + if (PackageItemObj) in self.Packages: PackageList =3D self.Packages[PackageItemObj] PackageList.append(PackageItemObj) self.Packages[PackageItemObj] =3D PackageList @@ -184,4 +184,4 @@ class InfPackageObject(): =20 def GetPackages(self, Arch =3D None): if Arch is None: - return self.Packages \ No newline at end of file + return self.Packages diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py b/Ba= seTools/Source/Python/UPT/Object/Parser/InfPcdObject.py index 62c1e8409a09..3b9dfaed0c98 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py @@ -411,7 +411,7 @@ class InfPcdObject(): else: PcdItemObj.SetSupportArchList(SupArchList) =20 - if self.Pcds.has_key((PcdTypeItem, PcdItemObj)): + if (PcdTypeItem, PcdItemObj) in self.Pcds: PcdsList =3D self.Pcds[PcdTypeItem, PcdItemObj] PcdsList.append(PcdItemObj) self.Pcds[PcdTypeItem, PcdItemObj] =3D PcdsList @@ -456,7 +456,7 @@ class InfPcdObject(): PackageInfo) =20 PcdTypeItem =3D KeysList[0][0] - if self.Pcds.has_key((PcdTypeItem, PcdItemObj)): + if (PcdTypeItem, PcdItemObj) in self.Pcds: PcdsList =3D self.Pcds[PcdTypeItem, PcdItemObj] PcdsList.append(PcdItemObj) self.Pcds[PcdTypeItem, PcdItemObj] =3D PcdsList diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py b/Ba= seTools/Source/Python/UPT/Object/Parser/InfPpiObject.py index eb6b6927140b..0f865c569665 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py @@ -327,7 +327,7 @@ class InfPpiObject(): #=20 pass =20 - if self.Ppis.has_key((InfPpiItemObj)): =20 + if (InfPpiItemObj) in self.Ppis: PpiList =3D self.Ppis[InfPpiItemObj] PpiList.append(InfPpiItemObj) self.Ppis[InfPpiItemObj] =3D PpiList @@ -340,4 +340,4 @@ class InfPpiObject(): =20 =20 def GetPpi(self): - return self.Ppis \ No newline at end of file + return self.Ppis diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py= b/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py index eb03095d6fec..6cadeb5a211c 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py @@ -296,7 +296,7 @@ class InfProtocolObject(): # pass =20 =20 - if self.Protocols.has_key((InfProtocolItemObj)): =20 + if (InfProtocolItemObj) in self.Protocols: ProcotolList =3D self.Protocols[InfProtocolItemObj] ProcotolList.append(InfProtocolItemObj) self.Protocols[InfProtocolItemObj] =3D ProcotolList diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py b= /BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py index 2302dd5b9673..285e89aacbfc 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py @@ -224,7 +224,7 @@ class InfSourcesObject(InfSectionCommonDef): =20 ItemObj.SetSupArchList(__SupArchList)=20 = =20 - if self.Sources.has_key((ItemObj)): =20 + if (ItemObj) in self.Sources: SourceContent =3D self.Sources[ItemObj] SourceContent.append(ItemObj) self.Sources[ItemObj] =3D SourceContent @@ -237,4 +237,3 @@ class InfSourcesObject(InfSectionCommonDef): =20 def GetSources(self): return self.Sources - =20 \ No newline at end of file diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObje= ct.py b/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py index 27a1c6ad25a0..f9db2944a495 100644 --- a/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py @@ -103,7 +103,7 @@ class InfUserExtensionObject(): # Line=3DLineNo, # ExtraData=3DNone) =20 - if self.UserExtension.has_key(IdContentItem): =20 + if IdContentItem in self.UserExtension: # # Each UserExtensions section header must have a unique se= t=20 # of UserId, IdString and Arch values. @@ -130,4 +130,4 @@ class InfUserExtensionObject(): return True =20 def GetUserExtension(self): - return self.UserExtension \ No newline at end of file + return self.UserExtension diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index 416aa73549d1..344b006bc424 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -77,7 +77,7 @@ TmpTableDict =3D {} # Otherwise, False is returned # def IsToolInPath(tool): - if os.environ.has_key('PATHEXT'): + if 'PATHEXT' in os.environ: extns =3D os.environ['PATHEXT'].split(os.path.pathsep) else: extns =3D ('',) --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 152955629418195.2245323245013; Wed, 20 Jun 2018 21:44:54 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 146A6211D507D; Wed, 20 Jun 2018 21:44:33 -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 341F72110BD5E for ; Wed, 20 Jun 2018 21:44:31 -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:27 +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:34 +0800 Message-Id: <20180621044346.28495-9-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 08/20] BaseTools: Replace StandardError with Expression 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" StandardError has been removed from python 3. Replace it with Exception. Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Source/Python/UPT/UPT.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/UPT/UPT.py b/BaseTools/Source/Python/U= PT/UPT.py index 930f0c1b9d54..4b5ca5be008c 100644 --- a/BaseTools/Source/Python/UPT/UPT.py +++ b/BaseTools/Source/Python/UPT/UPT.py @@ -310,7 +310,7 @@ def Main(): else: GlobalData.gDB.Commit() Mgr.commit() - except StandardError: + except Exception: Logger.Quiet(ST.MSG_RECOVER_FAIL) GlobalData.gDB.CloseDb() =20 --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556298220340.8531580754377; Wed, 20 Jun 2018 21:44:58 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3DFBD211D56A1; Wed, 20 Jun 2018 21:44:35 -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 3DD042110BD5E for ; Wed, 20 Jun 2018 21:44:33 -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:29 +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:35 +0800 Message-Id: <20180621044346.28495-10-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 09/20] BaseTools: Remove types.TypeType 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" "types.TypeType" is now an alias of the built-in "type" and is not compatible with python 3. Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Tests/TestTools.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py index 37338fd60db7..0a86686e3688 100644 --- a/BaseTools/Tests/TestTools.py +++ b/BaseTools/Tests/TestTools.py @@ -24,7 +24,6 @@ import random import shutil import subprocess import sys -import types import unittest =20 TestsDir =3D os.path.realpath(os.path.split(sys.argv[0])[0]) @@ -43,7 +42,7 @@ if PythonSourceDir not in sys.path: def MakeTheTestSuite(localItems): tests =3D [] for name, item in localItems.iteritems(): - if isinstance(item, types.TypeType): + if isinstance(item, type): if issubclass(item, unittest.TestCase): tests.append(unittest.TestLoader().loadTestsFromTestCase(i= tem)) elif issubclass(item, unittest.TestSuite): --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556301790885.4436681482392; Wed, 20 Jun 2018 21:45:01 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 664B4211D56A3; Wed, 20 Jun 2018 21:44:37 -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 39D29211D5079 for ; Wed, 20 Jun 2018 21:44:35 -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:31 +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:36 +0800 Message-Id: <20180621044346.28495-11-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 10/20] BaseTools: Refactor python raise statement 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" Make "raise" to be compatible with python3. Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/gcc/mingw-gcc-build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/gcc/mingw-gcc-build.py b/BaseTools/gcc/mingw-gcc-bui= ld.py index f7d0308bd9fa..49ff656c066f 100755 --- a/BaseTools/gcc/mingw-gcc-build.py +++ b/BaseTools/gcc/mingw-gcc-build.py @@ -508,8 +508,8 @@ class Builder: f =3D open(logFile, "w") f.write(output) f.close() - raise Exception, 'Failed to %s %s\n' % (stage, module) + \ - 'See output log at %s' % self.config.Relative(logFile) + raise Exception('Failed to %s %s\n' % (stage, module) + \ + 'See output log at %s' % self.config.Relative(logFile)) else: print('[done]') =20 --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 From nobody Mon Apr 29 23:15:57 2024 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 1529556312369375.47192972504524; Wed, 20 Jun 2018 21:45:12 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CAA3D211D56AB; 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 5F0422110BD5E for ; Wed, 20 Jun 2018 21:44:41 -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:38 +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:38 +0800 Message-Id: <20180621044346.28495-13-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 12/20] BaseTools: Migrate to the new octal literal 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" Change the octal literals according to PEP3127 https://www.python.org/dev/peps/pep-3127/ Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Source/Python/Common/LongFilePathOs.py | 2 +- BaseTools/Source/Python/UPT/Core/FileHook.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Common/LongFilePathOs.py b/BaseTools/S= ource/Python/Common/LongFilePathOs.py index 2cebbb276b19..4939a8bc733c 100644 --- a/BaseTools/Source/Python/Common/LongFilePathOs.py +++ b/BaseTools/Source/Python/Common/LongFilePathOs.py @@ -41,7 +41,7 @@ def rmdir(path): def mkdir(path): return os.mkdir(LongFilePath(path)) =20 -def makedirs(name, mode=3D0777): +def makedirs(name, mode=3D0o777): return os.makedirs(LongFilePath(name), mode) =20 def rename(old, new): diff --git a/BaseTools/Source/Python/UPT/Core/FileHook.py b/BaseTools/Sourc= e/Python/UPT/Core/FileHook.py index d8736a872366..67e86f4f7454 100644 --- a/BaseTools/Source/Python/UPT/Core/FileHook.py +++ b/BaseTools/Source/Python/UPT/Core/FileHook.py @@ -166,7 +166,7 @@ def _hookrm(path): else: __built_in_remove__(path) =20 -def _hookmkdir(path, mode=3D0777): +def _hookmkdir(path, mode=3D0o777): if GlobalData.gRECOVERMGR: GlobalData.gRECOVERMGR.bkmkdir(path, mode) else: --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556319477394.4151447469902; Wed, 20 Jun 2018 21:45:19 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 22DB0211D56B2; Wed, 20 Jun 2018 21:44:45 -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 5B0FE211D56AF for ; Wed, 20 Jun 2018 21:44:43 -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:40 +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:39 +0800 Message-Id: <20180621044346.28495-14-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 13/20] BaseTools: Unify long int and int in python scripts 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" According to PEP237, long int and int are unified. https://www.python.org/dev/peps/pep-0237/ Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Source/Python/Common/Expression.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Sourc= e/Python/Common/Expression.py index 5f24789f6c05..5ee9802c4fe9 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -255,7 +255,6 @@ class ValueExpression(BaseExpression): Oprand2 =3D IntToStr(Oprand2) TypeDict =3D { type(0) : 0, - type(0L) : 0, type('') : 1, type(True) : 2 } @@ -893,7 +892,7 @@ class ValueExpressionEx(ValueExpression): raise BadExpression('Type %s PCD Value Size is Larger = than 8 byte' % self.PcdType) else: try: - TmpValue =3D long(PcdValue) + TmpValue =3D int(PcdValue) TmpList =3D [] if TmpValue.bit_length() =3D=3D 0: PcdValue =3D '{0x00}' --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556324592464.7679359944607; Wed, 20 Jun 2018 21:45:24 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4F11D211D56B8; Wed, 20 Jun 2018 21:44:47 -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 8976A2110BD5E for ; Wed, 20 Jun 2018 21:44:45 -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:42 +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:40 +0800 Message-Id: <20180621044346.28495-15-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 14/20] BaseTools: Fix old python2 idioms 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_idioms" * Change some type comparisons to isinstance() calls: type(x) =3D=3D T -> isinstance(x, T) type(x) is T -> isinstance(x, T) type(x) !=3D T -> not isinstance(x, T) type(x) is not T -> not isinstance(x, T) * Change "while 1:" into "while True:". * Change both v =3D list(EXPR) v.sort() foo(v) and the more general v =3D EXPR v.sort() foo(v) into v =3D sorted(EXPR) foo(v) Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Scripts/MemoryProfileSymbolGen.py | 2 +- BaseTools/Scripts/UpdateBuildVersions.py | 6 ++-- BaseTools/Source/Python/AutoGen/BuildEngine.py | 2 +- BaseTools/Source/Python/AutoGen/GenDepex.py | 2 +- BaseTools/Source/Python/Common/Expression.py | 34 +++++= +++++---------- BaseTools/Source/Python/Common/Misc.py | 13 ++++-= --- BaseTools/Source/Python/Common/RangeExpression.py | 16 ++++-= ---- BaseTools/Source/Python/Common/StringUtils.py | 4 +-- BaseTools/Source/Python/Common/ToolDefClassObject.py | 2 +- BaseTools/Source/Python/Common/VpdInfoFile.py | 3 +- BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py | 12 +++--= -- BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py | 2 +- BaseTools/Source/Python/Eot/Parser.py | 2 +- BaseTools/Source/Python/GenFds/FdfParser.py | 2 +- BaseTools/Source/Python/GenFds/GenFds.py | 2 +- BaseTools/Source/Python/TargetTool/TargetTool.py | 2 +- BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py | 15 +++--= ---- BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py | 21 ++++-= ------- BaseTools/Source/Python/UPT/Library/Misc.py | 6 ++-- BaseTools/Source/Python/UPT/Library/ParserValidate.py | 2 +- BaseTools/Source/Python/UPT/Library/StringUtils.py | 2 +- BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py | 2 +- BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py | 3 +- BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py | 3 +- BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py | 3 +- BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 +- BaseTools/Source/Python/Workspace/DscBuildData.py | 8 ++--- BaseTools/Source/Python/Workspace/MetaFileParser.py | 20 +++++= +------ BaseTools/Source/Python/build/BuildReport.py | 3 +- BaseTools/Source/Python/build/build.py | 4 +-- BaseTools/gcc/mingw-gcc-build.py | 4 +-- 31 files changed, 93 insertions(+), 111 deletions(-) diff --git a/BaseTools/Scripts/MemoryProfileSymbolGen.py b/BaseTools/Script= s/MemoryProfileSymbolGen.py index 1dbb116bba0d..eaae0283c51d 100644 --- a/BaseTools/Scripts/MemoryProfileSymbolGen.py +++ b/BaseTools/Scripts/MemoryProfileSymbolGen.py @@ -264,7 +264,7 @@ def main(): return 1 =20 try: - while 1: + while True: line =3D file.readline() if not line: break diff --git a/BaseTools/Scripts/UpdateBuildVersions.py b/BaseTools/Scripts/U= pdateBuildVersions.py index 74e3ae4302e8..6c1dcf1cec65 100755 --- a/BaseTools/Scripts/UpdateBuildVersions.py +++ b/BaseTools/Scripts/UpdateBuildVersions.py @@ -253,7 +253,7 @@ def GetSvnRevision(opts): StatusCmd =3D "svn st -v --depth infinity --non-interactive" contents =3D ShellCommandResults(StatusCmd, opts) os.chdir(Cwd) - if type(contents) is ListType: + if isinstance(contents, ListType): for line in contents: if line.startswith("M "): Modified =3D True @@ -263,7 +263,7 @@ def GetSvnRevision(opts): InfoCmd =3D "svn info %s" % SrcPath.replace("\\", "/").strip() Revision =3D 0 contents =3D ShellCommandResults(InfoCmd, opts) - if type(contents) is IntType: + if isinstance(contents, IntType): return 0, Modified for line in contents: line =3D line.strip() @@ -284,7 +284,7 @@ def CheckSvn(opts): VerCmd =3D "svn --version" contents =3D ShellCommandResults(VerCmd, opts) opts.silent =3D OriginalSilent - if type(contents) is IntType: + if isinstance(contents, IntType): if opts.verbose: sys.stdout.write("SVN does not appear to be available.\n") sys.stdout.flush() diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Sou= rce/Python/AutoGen/BuildEngine.py index 4d81ffa3436f..d285fa681220 100644 --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py @@ -69,7 +69,7 @@ class TargetDescBlock(object): return hash(self.Target.Path) =20 def __eq__(self, Other): - if type(Other) =3D=3D type(self): + if isinstance(Other, type(self)): return Other.Target.Path =3D=3D self.Target.Path else: return str(Other) =3D=3D self.Target.Path diff --git a/BaseTools/Source/Python/AutoGen/GenDepex.py b/BaseTools/Source= /Python/AutoGen/GenDepex.py index b69788c37e08..e89191a72b9f 100644 --- a/BaseTools/Source/Python/AutoGen/GenDepex.py +++ b/BaseTools/Source/Python/AutoGen/GenDepex.py @@ -140,7 +140,7 @@ class DependencyExpression: def __init__(self, Expression, ModuleType, Optimize=3DFalse): self.ModuleType =3D ModuleType self.Phase =3D gType2Phase[ModuleType] - if type(Expression) =3D=3D type([]): + if isinstance(Expression, type([])): self.ExpressionString =3D " ".join(Expression) self.TokenList =3D Expression else: diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Sourc= e/Python/Common/Expression.py index 5ee9802c4fe9..3dbcac8daf2c 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -246,12 +246,12 @@ class ValueExpression(BaseExpression): WrnExp =3D None =20 if Operator not in {"=3D=3D", "!=3D", ">=3D", "<=3D", ">", "<", "i= n", "not in"} and \ - (type(Oprand1) =3D=3D type('') or type(Oprand2) =3D=3D type(''= )): + (isinstance(Oprand1, type('')) or isinstance(Oprand2, type('')= )): raise BadExpression(ERR_STRING_EXPR % Operator) if Operator in {'in', 'not in'}: - if type(Oprand1) !=3D type(''): + if not isinstance(Oprand1, type('')): Oprand1 =3D IntToStr(Oprand1) - if type(Oprand2) !=3D type(''): + if not isinstance(Oprand2, type('')): Oprand2 =3D IntToStr(Oprand2) TypeDict =3D { type(0) : 0, @@ -261,18 +261,18 @@ class ValueExpression(BaseExpression): =20 EvalStr =3D '' if Operator in {"!", "NOT", "not"}: - if type(Oprand1) =3D=3D type(''): + if isinstance(Oprand1, type('')): raise BadExpression(ERR_STRING_EXPR % Operator) EvalStr =3D 'not Oprand1' elif Operator in {"~"}: - if type(Oprand1) =3D=3D type(''): + if isinstance(Oprand1, type('')): raise BadExpression(ERR_STRING_EXPR % Operator) EvalStr =3D '~ Oprand1' else: if Operator in {"+", "-"} and (type(True) in {type(Oprand1), t= ype(Oprand2)}): # Boolean in '+'/'-' will be evaluated but raise warning WrnExp =3D WrnExpression(WRN_BOOL_EXPR) - elif type('') in {type(Oprand1), type(Oprand2)} and type(Opran= d1)!=3D type(Oprand2): + elif type('') in {type(Oprand1), type(Oprand2)} and not isinst= ance(Oprand1, type(Oprand2)): # =3D=3D between string and number/boolean will always ret= urn False, !=3D return True if Operator =3D=3D "=3D=3D": WrnExp =3D WrnExpression(WRN_EQCMP_STR_OTHERS) @@ -293,11 +293,11 @@ class ValueExpression(BaseExpression): pass else: raise BadExpression(ERR_EXPR_TYPE) - if type(Oprand1) =3D=3D type('') and type(Oprand2) =3D=3D type= (''): + if isinstance(Oprand1, type('')) and isinstance(Oprand2, type(= '')): if (Oprand1.startswith('L"') and not Oprand2.startswith('L= "')) or \ (not Oprand1.startswith('L"') and Oprand2.startswith('= L"')): raise BadExpression(ERR_STRING_CMP % (Oprand1, Operato= r, Oprand2)) - if 'in' in Operator and type(Oprand2) =3D=3D type(''): + if 'in' in Operator and isinstance(Oprand2, type('')): Oprand2 =3D Oprand2.split() EvalStr =3D 'Oprand1 ' + Operator + ' Oprand2' =20 @@ -325,7 +325,7 @@ class ValueExpression(BaseExpression): def __init__(self, Expression, SymbolTable=3D{}): super(ValueExpression, self).__init__(self, Expression, SymbolTabl= e) self._NoProcess =3D False - if type(Expression) !=3D type(''): + if not isinstance(Expression, type('')): self._Expr =3D Expression self._NoProcess =3D True return @@ -373,7 +373,7 @@ class ValueExpression(BaseExpression): Token =3D self._GetToken() except BadExpression: pass - if type(Token) =3D=3D type('') and Token.startswith('{') and T= oken.endswith('}') and self._Idx >=3D self._Len: + if isinstance(Token, type('')) and Token.startswith('{') and T= oken.endswith('}') and self._Idx >=3D self._Len: return self._Expr =20 self._Idx =3D 0 @@ -381,7 +381,7 @@ class ValueExpression(BaseExpression): =20 Val =3D self._ConExpr() RealVal =3D Val - if type(Val) =3D=3D type(''): + if isinstance(Val, type('')): if Val =3D=3D 'L""': Val =3D False elif not Val: @@ -640,7 +640,7 @@ class ValueExpression(BaseExpression): Ex.Pcd =3D self._Token raise Ex self._Token =3D ValueExpression(self._Symb[self._Token], self.= _Symb)(True, self._Depth+1) - if type(self._Token) !=3D type(''): + if not isinstance(self._Token, type('')): self._LiteralToken =3D hex(self._Token) return =20 @@ -735,7 +735,7 @@ class ValueExpression(BaseExpression): if Ch =3D=3D ')': TmpValue =3D self._Expr[Idx :self._Idx - 1] TmpValue =3D ValueExpression(TmpValue)(True) - TmpValue =3D '0x%x' % int(TmpValue) if type(TmpValue) = !=3D type('') else TmpValue + TmpValue =3D '0x%x' % int(TmpValue) if not isinstance(= TmpValue, type('')) else TmpValue break self._Token, Size =3D ParseFieldValue(Prefix + '(' + TmpValue = + ')') return self._Token @@ -824,7 +824,7 @@ class ValueExpressionEx(ValueExpression): PcdValue =3D PcdValue.strip() if PcdValue.startswith('{') and PcdValue.endswith('}'): PcdValue =3D SplitPcdValueString(PcdValue[1:-1]) - if type(PcdValue) =3D=3D type([]): + if isinstance(PcdValue, type([])): TmpValue =3D 0 Size =3D 0 ValueType =3D '' @@ -863,7 +863,7 @@ class ValueExpressionEx(ValueExpression): else: ItemValue =3D ParseFieldValue(Item)[0] =20 - if type(ItemValue) =3D=3D type(''): + if isinstance(ItemValue, type('')): ItemValue =3D int(ItemValue, 0) =20 TmpValue =3D (ItemValue << (Size * 8)) | TmpValue @@ -873,7 +873,7 @@ class ValueExpressionEx(ValueExpression): TmpValue, Size =3D ParseFieldValue(PcdValue) except BadExpression as Value: raise BadExpression("Type: %s, Value: %s, %s" % (s= elf.PcdType, PcdValue, Value)) - if type(TmpValue) =3D=3D type(''): + if isinstance(TmpValue, type('')): try: TmpValue =3D int(TmpValue) except: @@ -996,7 +996,7 @@ class ValueExpressionEx(ValueExpression): TmpValue =3D ValueExpressionEx(Item, V= alueType, self._Symb)(True) else: TmpValue =3D ValueExpressionEx(Item, s= elf.PcdType, self._Symb)(True) - Item =3D '0x%x' % TmpValue if type(TmpValu= e) !=3D type('') else TmpValue + Item =3D '0x%x' % TmpValue if not isinstan= ce(TmpValue, type('')) else TmpValue if ItemSize =3D=3D 0: ItemValue, ItemSize =3D ParseFieldValu= e(Item) if Item[0] not in {'"', 'L', '{'} and = ItemSize > 1: diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Pyth= on/Common/Misc.py index 739a2b0cb45b..b3989270afc4 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -1292,9 +1292,9 @@ def ParseDevPathValue (Value): return '{' + out + '}', Size =20 def ParseFieldValue (Value): - if type(Value) =3D=3D type(0): + if isinstance(Value, type(0)): return Value, (Value.bit_length() + 7) / 8 - if type(Value) !=3D type(''): + if not isinstance(Value, type('')): raise BadExpression('Type %s is %s' %(Value, type(Value))) Value =3D Value.strip() if Value.startswith(TAB_UINT8) and Value.endswith(')'): @@ -1585,8 +1585,7 @@ def CheckPcdDatum(Type, Value): Printset.add(TAB_PRINTCHAR_BS) Printset.add(TAB_PRINTCHAR_NUL) if not set(Value).issubset(Printset): - PrintList =3D list(Printset) - PrintList.sort() + PrintList =3D sorted(Printset) return False, "Invalid PCD string value of type [%s]; must= be printable chars %s." % (Type, PrintList) elif Type =3D=3D 'BOOLEAN': if Value not in ['TRUE', 'True', 'true', '0x1', '0x01', '1', 'FALS= E', 'False', 'false', '0x0', '0x00', '0']: @@ -1748,7 +1747,7 @@ class PathClass(object): # @retval True The two PathClass are the same # def __eq__(self, Other): - if type(Other) =3D=3D type(self): + if isinstance(Other, type(self)): return self.Path =3D=3D Other.Path else: return self.Path =3D=3D str(Other) @@ -1761,7 +1760,7 @@ class PathClass(object): # @retval -1 The first PathClass is less than the second PathClass # @retval 1 The first PathClass is Bigger than the second PathClass def __cmp__(self, Other): - if type(Other) =3D=3D type(self): + if isinstance(Other, type(self)): OtherKey =3D Other.Path else: OtherKey =3D str(Other) @@ -2011,7 +2010,7 @@ class SkuClass(): return ["DEFAULT"] skulist =3D [sku] nextsku =3D sku - while 1: + while True: nextsku =3D self.GetNextSkuId(nextsku) skulist.append(nextsku) if nextsku =3D=3D "DEFAULT": diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/= Source/Python/Common/RangeExpression.py index d02e52f349b0..e5ba5d7ad163 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -98,7 +98,7 @@ class XOROperatorObject(object): def __init__(self): =20 pass def Calculate(self, Operand, DataType, SymbolTable):=20 - if type(Operand) =3D=3D type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr =3D "XOR ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId =3D str(uuid.uuid1()) @@ -112,7 +112,7 @@ class LEOperatorObject(object): def __init__(self): =20 pass def Calculate(self, Operand, DataType, SymbolTable):=20 - if type(Operand) =3D=3D type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr =3D "LE ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId1 =3D str(uuid.uuid1()) @@ -124,7 +124,7 @@ class LTOperatorObject(object): def __init__(self): =20 pass def Calculate(self, Operand, DataType, SymbolTable): - if type(Operand) =3D=3D type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr =3D "LT ..."=20 raise BadExpression(ERR_SNYTAX % Expr)=20 rangeId1 =3D str(uuid.uuid1()) @@ -137,7 +137,7 @@ class GEOperatorObject(object): def __init__(self): =20 pass def Calculate(self, Operand, DataType, SymbolTable):=20 - if type(Operand) =3D=3D type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr =3D "GE ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId1 =3D str(uuid.uuid1()) @@ -150,7 +150,7 @@ class GTOperatorObject(object): def __init__(self): =20 pass def Calculate(self, Operand, DataType, SymbolTable):=20 - if type(Operand) =3D=3D type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr =3D "GT ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId1 =3D str(uuid.uuid1()) @@ -163,7 +163,7 @@ class EQOperatorObject(object): def __init__(self): =20 pass def Calculate(self, Operand, DataType, SymbolTable):=20 - if type(Operand) =3D=3D type('') and not Operand.isalnum(): + if isinstance(Operand, type('')) and not Operand.isalnum(): Expr =3D "EQ ..." raise BadExpression(ERR_SNYTAX % Expr) rangeId1 =3D str(uuid.uuid1()) @@ -351,7 +351,7 @@ class RangeExpression(BaseExpression): def __init__(self, Expression, PcdDataType, SymbolTable =3D {}): super(RangeExpression, self).__init__(self, Expression, PcdDataTyp= e, SymbolTable) self._NoProcess =3D False - if type(Expression) !=3D type(''): + if not isinstance(Expression, type('')): self._Expr =3D Expression self._NoProcess =3D True return @@ -572,7 +572,7 @@ class RangeExpression(BaseExpression): Ex.Pcd =3D self._Token raise Ex self._Token =3D RangeExpression(self._Symb[self._Token], self.= _Symb)(True, self._Depth + 1) - if type(self._Token) !=3D type(''): + if not isinstance(self._Token, type('')): self._LiteralToken =3D hex(self._Token) return =20 diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Sour= ce/Python/Common/StringUtils.py index e9ac77dc71a1..2f45bc3674cc 100644 --- a/BaseTools/Source/Python/Common/StringUtils.py +++ b/BaseTools/Source/Python/Common/StringUtils.py @@ -252,7 +252,7 @@ def SplitModuleType(Key): def ReplaceMacros(StringList, MacroDefinitions=3D{}, SelfReplacement=3DFal= se): NewList =3D [] for String in StringList: - if type(String) =3D=3D type(''): + if isinstance(String, type('')): NewList.append(ReplaceMacro(String, MacroDefinitions, SelfRepl= acement)) else: NewList.append(String) @@ -794,7 +794,7 @@ def RemoveBlockComment(Lines): # Get String of a List # def GetStringOfList(List, Split=3D' '): - if type(List) !=3D type([]): + if not isinstance(List, type([])): return List Str =3D '' for Item in List: diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseToo= ls/Source/Python/Common/ToolDefClassObject.py index d79b970f5416..dec48b3f295b 100644 --- a/BaseTools/Source/Python/Common/ToolDefClassObject.py +++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py @@ -159,7 +159,7 @@ class ToolDefClassObject(object): if ErrorCode !=3D 0: EdkLogger.error("tools_def.txt parser", FI= LE_NOT_FOUND, ExtraData=3DIncFile) =20 - if type(IncFileTmp) is PathClass: + if isinstance(IncFileTmp, PathClass): IncFile =3D IncFileTmp.Path else: IncFile =3D IncFileTmp diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Sour= ce/Python/Common/VpdInfoFile.py index 93175d41e9f7..b98c021b5777 100644 --- a/BaseTools/Source/Python/Common/VpdInfoFile.py +++ b/BaseTools/Source/Python/Common/VpdInfoFile.py @@ -127,8 +127,7 @@ class VpdInfoFile: "Invalid parameter FilePath: %s." % FilePath) = =20 =20 Content =3D FILE_COMMENT_TEMPLATE - Pcds =3D self._VpdArray.keys() - Pcds.sort() + Pcds =3D sorted(self._VpdArray.keys()) for Pcd in Pcds: i =3D 0 PcdTokenCName =3D Pcd.TokenCName diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.p= y b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py index 38662c929293..003a3f6559fa 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py @@ -69,7 +69,7 @@ def ParseMacro(Parser): self._ItemType =3D MODEL_META_DATA_DEFINE # DEFINE defined macros if Type =3D=3D TAB_DSC_DEFINES_DEFINE: - if type(self) =3D=3D DecParser: + if isinstance(self, DecParser): if MODEL_META_DATA_HEADER in self._SectionType: self._FileLocalMacros[Name] =3D Value else: @@ -84,7 +84,7 @@ def ParseMacro(Parser): SectionLocalMacros =3D self._SectionsMacroDict[SectionDict= Key] SectionLocalMacros[Name] =3D Value # EDK_GLOBAL defined macros - elif type(self) !=3D DscParser: + elif not isinstance(self, DscParser): EdkLogger.error('Parser', FORMAT_INVALID, "EDK_GLOBAL can only= be used in .dsc file", ExtraData=3Dself._CurrentLine, File=3Dself.Met= aFile, Line=3Dself._LineIndex+1) elif self._SectionType !=3D MODEL_META_DATA_HEADER: @@ -216,7 +216,7 @@ class MetaFileParser(object): # DataInfo =3D [data_type, scope1(arch), scope2(platform/moduletype)] # def __getitem__(self, DataInfo): - if type(DataInfo) !=3D type(()): + if not isinstance(DataInfo, type(())): DataInfo =3D (DataInfo,) =20 # Parse the file first, if necessary @@ -258,7 +258,7 @@ class MetaFileParser(object): TokenList =3D GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT) self._ValueList[0:len(TokenList)] =3D TokenList # Don't do macro replacement for dsc file at this point - if type(self) !=3D DscParser: + if not isinstance(self, DscParser): Macros =3D self._Macros self._ValueList =3D [ReplaceMacro(Value, Macros) for Value in = self._ValueList] =20 @@ -356,7 +356,7 @@ class MetaFileParser(object): if os.path.exists(UniFile): self._UniObj =3D UniParser(UniFile, IsExtraUni=3DFalse, Is= ModuleUni=3DFalse) =20 - if type(self) =3D=3D InfParser and self._Version < 0x00010005: + if isinstance(self, InfParser) and self._Version < 0x00010005: # EDK module allows using defines as macros self._FileLocalMacros[Name] =3D Value self._Defines[Name] =3D Value @@ -371,7 +371,7 @@ class MetaFileParser(object): self._ValueList[1] =3D TokenList2[1] # keys else: self._ValueList[1] =3D TokenList[0] - if len(TokenList) =3D=3D 2 and type(self) !=3D DscParser: # value + if len(TokenList) =3D=3D 2 and not isinstance(self, DscParser): # = value self._ValueList[2] =3D ReplaceMacro(TokenList[1], self._Macros) =20 if self._ValueList[1].count('_') !=3D 4: diff --git a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py b/BaseTools/Sou= rce/Python/Ecc/Xml/XmlRoutines.py index 811106133cb4..1e45806fa657 100644 --- a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py +++ b/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py @@ -35,7 +35,7 @@ def CreateXmlElement(Name, String, NodeList, AttributeLis= t): Element.appendChild(Doc.createTextNode(String)) =20 for Item in NodeList: - if type(Item) =3D=3D type([]): + if isinstance(Item, type([])): Key =3D Item[0] Value =3D Item[1] if Key !=3D '' and Key is not None and Value !=3D '' and Value= is not None: diff --git a/BaseTools/Source/Python/Eot/Parser.py b/BaseTools/Source/Pytho= n/Eot/Parser.py index ff88e957ad0d..0b720d5b2187 100644 --- a/BaseTools/Source/Python/Eot/Parser.py +++ b/BaseTools/Source/Python/Eot/Parser.py @@ -730,7 +730,7 @@ def GetParameter(Parameter, Index =3D 1): # @return: The name of parameter # def GetParameterName(Parameter): - if type(Parameter) =3D=3D type('') and Parameter.startswith('&'): + if isinstance(Parameter, type('')) and Parameter.startswith('&'): return Parameter[1:].replace('{', '').replace('}', '').replace('\r= ', '').replace('\n', '').strip() else: return Parameter.strip() diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index 88ba70b400d2..22f430894d47 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -905,7 +905,7 @@ class FdfParser: MacroDict.update(GlobalData.gCommandLineDefines) if GlobalData.BuildOptionPcd: for Item in GlobalData.BuildOptionPcd: - if type(Item) is tuple: + if isinstance(Item, tuple): continue PcdName, TmpValue =3D Item.split("=3D") TmpValue =3D BuildOptionValue(TmpValue, {}) diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Py= thon/GenFds/GenFds.py index 6b6511915eb3..1abebea5fdc6 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -786,7 +786,7 @@ class GenFds : if not Name: continue =20 - Name =3D ' '.join(Name) if type(Name) =3D=3D type(= []) else Name + Name =3D ' '.join(Name) if isinstance(Name, type([= ])) else Name GuidXRefFile.write("%s %s\n" %(FileStatementGuid, = Name)) =20 # Append GUIDs, Protocols, and PPIs to the Xref file diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/S= ource/Python/TargetTool/TargetTool.py index ed567b870816..26d2bb9ebfce 100644 --- a/BaseTools/Source/Python/TargetTool/TargetTool.py +++ b/BaseTools/Source/Python/TargetTool/TargetTool.py @@ -83,7 +83,7 @@ class TargetTool(): def Print(self): errMsg =3D '' for Key in self.TargetTxtDictionary: - if type(self.TargetTxtDictionary[Key]) =3D=3D type([]): + if isinstance(self.TargetTxtDictionary[Key], type([])): print("%-30s =3D %s" % (Key, ''.join(elem + ' ' for elem i= n self.TargetTxtDictionary[Key]))) elif self.TargetTxtDictionary[Key] is None: errMsg +=3D " Missing %s configuration information, pleas= e use TargetTool to set value!" % Key + os.linesep=20 diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py b/BaseTo= ols/Source/Python/UPT/GenMetaFile/GenDecFile.py index 9397359367e7..a1a9d38087ee 100644 --- a/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py +++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py @@ -123,8 +123,7 @@ def GenPcd(Package, Content): if Pcd.GetSupModuleList(): Statement +=3D GenDecTailComment(Pcd.GetSupModuleList()) =20 - ArchList =3D Pcd.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(Pcd.GetSupArchList()) SortedArch =3D ' '.join(ArchList) if SortedArch in NewSectionDict: NewSectionDict[SortedArch] =3D \ @@ -205,8 +204,7 @@ def GenGuidProtocolPpi(Package, Content): # if Guid.GetSupModuleList(): Statement +=3D GenDecTailComment(Guid.GetSupModuleList()) =20 - ArchList =3D Guid.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(Guid.GetSupArchList()) SortedArch =3D ' '.join(ArchList) if SortedArch in NewSectionDict: NewSectionDict[SortedArch] =3D \ @@ -246,8 +244,7 @@ def GenGuidProtocolPpi(Package, Content): # if Protocol.GetSupModuleList(): Statement +=3D GenDecTailComment(Protocol.GetSupModuleList()) - ArchList =3D Protocol.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(Protocol.GetSupArchList()) SortedArch =3D ' '.join(ArchList) if SortedArch in NewSectionDict: NewSectionDict[SortedArch] =3D \ @@ -287,8 +284,7 @@ def GenGuidProtocolPpi(Package, Content): # if Ppi.GetSupModuleList(): Statement +=3D GenDecTailComment(Ppi.GetSupModuleList()) - ArchList =3D Ppi.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(Ppi.GetSupArchList()) SortedArch =3D ' '.join(ArchList) if SortedArch in NewSectionDict: NewSectionDict[SortedArch] =3D \ @@ -463,8 +459,7 @@ def PackageToDec(Package, DistHeader =3D None): if LibraryClass.GetSupModuleList(): Statement +=3D \ GenDecTailComment(LibraryClass.GetSupModuleList()) - ArchList =3D LibraryClass.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(LibraryClass.GetSupArchList()) SortedArch =3D ' '.join(ArchList) if SortedArch in NewSectionDict: NewSectionDict[SortedArch] =3D \ diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTo= ols/Source/Python/UPT/GenMetaFile/GenInfFile.py index 3d403ecbe09b..0bedea6a60c4 100644 --- a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py +++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py @@ -494,8 +494,7 @@ def GenPackages(ModuleObject): Statement +=3D RelaPath.replace('\\', '/') if FFE: Statement +=3D '|' + FFE - ArchList =3D PackageDependency.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(PackageDependency.GetSupArchList()) SortedArch =3D ' '.join(ArchList) if SortedArch in NewSectionDict: NewSectionDict[SortedArch] =3D NewSectionDict[SortedArch] + [S= tatement] @@ -514,8 +513,7 @@ def GenSources(ModuleObject): SourceFile =3D Source.GetSourceFile() Family =3D Source.GetFamily() FeatureFlag =3D Source.GetFeatureFlag() - SupArchList =3D Source.GetSupArchList() - SupArchList.sort() + SupArchList =3D sorted(Source.GetSupArchList()) SortedArch =3D ' '.join(SupArchList) Statement =3D GenSourceStatement(ConvertPath(SourceFile), Family, = FeatureFlag) if SortedArch in NewSectionDict: @@ -723,8 +721,7 @@ def GenGuidSections(GuidObjList): # # merge duplicate items # - ArchList =3D Guid.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(Guid.GetSupArchList()) SortedArch =3D ' '.join(ArchList) if (Statement, SortedArch) in GuidDict: PreviousComment =3D GuidDict[Statement, SortedArch] @@ -783,8 +780,7 @@ def GenProtocolPPiSections(ObjList, IsProtocol): # # merge duplicate items # - ArchList =3D Object.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(Object.GetSupArchList()) SortedArch =3D ' '.join(ArchList) if (Statement, SortedArch) in Dict: PreviousComment =3D Dict[Statement, SortedArch] @@ -858,8 +854,7 @@ def GenPcdSections(ModuleObject): # # Merge duplicate entries # - ArchList =3D Pcd.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(Pcd.GetSupArchList()) SortedArch =3D ' '.join(ArchList) if (Statement, SortedArch) in Dict: PreviousComment =3D Dict[Statement, SortedArch] @@ -1026,8 +1021,7 @@ def GenSpecialSections(ObjectList, SectionName, UserE= xtensionsContent=3D''): if CommentStr and not CommentStr.endswith('\n#\n'): CommentStr =3D CommentStr + '#\n' NewStateMent =3D CommentStr + Statement - SupArch =3D Obj.GetSupArchList() - SupArch.sort() + SupArch =3D sorted(Obj.GetSupArchList()) SortedArch =3D ' '.join(SupArch) if SortedArch in NewSectionDict: NewSectionDict[SortedArch] =3D NewSectionDict[SortedArch] + [N= ewStateMent] @@ -1105,8 +1099,7 @@ def GenBinaries(ModuleObject): FileName =3D ConvertPath(FileNameObj.GetFilename()) FileType =3D FileNameObj.GetFileType() FFE =3D FileNameObj.GetFeatureFlag() - ArchList =3D FileNameObj.GetSupArchList() - ArchList.sort() + ArchList =3D sorted(FileNameObj.GetSupArchList()) SortedArch =3D ' '.join(ArchList) Key =3D (FileName, FileType, FFE, SortedArch) if Key in BinariesDict: diff --git a/BaseTools/Source/Python/UPT/Library/Misc.py b/BaseTools/Source= /Python/UPT/Library/Misc.py index 733abc6ff5de..a690942811a0 100644 --- a/BaseTools/Source/Python/UPT/Library/Misc.py +++ b/BaseTools/Source/Python/UPT/Library/Misc.py @@ -515,7 +515,7 @@ class PathClass(object): # Check whether PathClass are the same # def __eq__(self, Other): - if type(Other) =3D=3D type(self): + if isinstance(Other, type(self)): return self.Path =3D=3D Other.Path else: return self.Path =3D=3D str(Other) @@ -820,11 +820,11 @@ def ConvertArchList(ArchList): if not ArchList: return NewArchList =20 - if type(ArchList) =3D=3D list: + if isinstance(ArchList, list): for Arch in ArchList: Arch =3D Arch.upper() NewArchList.append(Arch) - elif type(ArchList) =3D=3D str: + elif isinstance(ArchList, str): ArchList =3D ArchList.upper() NewArchList.append(ArchList) =20 diff --git a/BaseTools/Source/Python/UPT/Library/ParserValidate.py b/BaseTo= ols/Source/Python/UPT/Library/ParserValidate.py index 3f8ca9d609ae..dc93cedd917e 100644 --- a/BaseTools/Source/Python/UPT/Library/ParserValidate.py +++ b/BaseTools/Source/Python/UPT/Library/ParserValidate.py @@ -341,7 +341,7 @@ def IsValidCFormatGuid(Guid): # # Index may out of bound # - if type(List[Index]) !=3D type(1) or \ + if not isinstance(List[Index], type(1)) or \ len(Value) > List[Index] or len(Value) < 3: return False =20 diff --git a/BaseTools/Source/Python/UPT/Library/StringUtils.py b/BaseTools= /Source/Python/UPT/Library/StringUtils.py index 1003ffa673de..339894ee0940 100644 --- a/BaseTools/Source/Python/UPT/Library/StringUtils.py +++ b/BaseTools/Source/Python/UPT/Library/StringUtils.py @@ -652,7 +652,7 @@ def ConvertToSqlString2(String): # @param Split: split character # def GetStringOfList(List, Split=3D' '): - if type(List) !=3D type([]): + if not isinstance(List, type([])): return List Str =3D '' for Item in List: diff --git a/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py b/BaseT= ools/Source/Python/UPT/Library/Xml/XmlRoutines.py index 1096bc5b1849..dbaee678af45 100644 --- a/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py +++ b/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py @@ -40,7 +40,7 @@ def CreateXmlElement(Name, String, NodeList, AttributeLis= t): Element.appendChild(Doc.createTextNode(String)) =20 for Item in NodeList: - if type(Item) =3D=3D type([]): + if isinstance(Item, type([])): Key =3D Item[0] Value =3D Item[1] if Key !=3D '' and Key is not None and Value !=3D '' and Value= is not None: diff --git a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py b/Ba= seTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py index 1e0c79d6677d..bcc5d96f9153 100644 --- a/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py +++ b/BaseTools/Source/Python/UPT/PomAdapter/DecPomAlignment.py @@ -410,8 +410,7 @@ class DecPomAlignment(PackageObject): #=20 PackagePath =3D os.path.split(self.GetFullPath())[0] IncludePathList =3D \ - [os.path.normpath(Path) + sep for Path in IncludesDict.keys()] - IncludePathList.sort() + sorted([os.path.normpath(Path) + sep for Path in IncludesDict.= keys()]) =20 # # get a non-overlap set of include path, IncludePathList should be=20 diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/Ba= seTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py index a5929e15de2d..84f0d43f015e 100644 --- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py +++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py @@ -611,8 +611,7 @@ class InfPomAlignment(ModuleObject): SourceFile =3D Item.GetSourceFileName() Family =3D Item.GetFamily() FeatureFlag =3D Item.GetFeatureFlagExp() - SupArchList =3D ConvertArchList(Item.GetSupArchList()) - SupArchList.sort() + SupArchList =3D sorted(ConvertArchList(Item.GetSupArchList= ())) Source =3D SourceFileObject() Source.SetSourceFile(SourceFile) Source.SetFamily(Family) diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py = b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py index cee42516231c..3bb506bea660 100644 --- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py +++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignmentMisc.py @@ -194,8 +194,7 @@ def GenBinaryData(BinaryData, BinaryObj, BinariesDict, = AsBuildIns, BinaryFileObj # can be used for the attribute. # If both not have VALID_ARCHITECTURE comment and no architecturie= specified, then keep it empty. # =20 - SupArchList =3D ConvertArchList(ItemObj.GetSupArchList()) - SupArchList.sort() + SupArchList =3D sorted(ConvertArchList(ItemObj.GetSupArchList())) if len(SupArchList) =3D=3D 1 and SupArchList[0] =3D=3D 'COMMON': if not (len(OriSupArchList) =3D=3D 1 or OriSupArchList[0] =3D= =3D 'COMMON'): SupArchList =3D OriSupArchList diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTo= ols/Source/Python/Workspace/BuildClassObject.py index 2569235fb875..c188b47534f8 100644 --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py @@ -217,7 +217,7 @@ class StructurePcd(PcdClassObject): self.DscRawValue =3D PcdObject.DscRawValue if PcdObject.DscRawValu= e else self.DscRawValue self.PcdValueFromComm =3D PcdObject.PcdValueFromComm if PcdObject.= PcdValueFromComm else self.PcdValueFromComm self.DefinitionPosition =3D PcdObject.DefinitionPosition if PcdObj= ect.DefinitionPosition else self.DefinitionPosition - if type(PcdObject) is StructurePcd: + if isinstance(PcdObject, StructurePcd): self.StructuredPcdIncludeFile =3D PcdObject.StructuredPcdInclu= deFile if PcdObject.StructuredPcdIncludeFile else self.StructuredPcdInclude= File self.PackageDecs =3D PcdObject.PackageDecs if PcdObject.Packag= eDecs else self.PackageDecs self.DefaultValues =3D PcdObject.DefaultValues if PcdObject.De= faultValues else self.DefaultValues diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index bbc5af34eb9e..09002526b8b0 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -928,13 +928,13 @@ class DscBuildData(PlatformBuildClassObject): for pcdname in Pcds: pcd =3D Pcds[pcdname] Pcds[pcdname].SkuInfoList =3D {TAB_DEFAULT:pcd.SkuInfoList= [skuid] for skuid in pcd.SkuInfoList if skuid in available_sku} - if type(pcd) is StructurePcd and pcd.SkuOverrideValues: + if isinstance(pcd, StructurePcd) and pcd.SkuOverrideValues: Pcds[pcdname].SkuOverrideValues =3D {TAB_DEFAULT:pcd.S= kuOverrideValues[skuid] for skuid in pcd.SkuOverrideValues if skuid in avai= lable_sku} else: for pcdname in Pcds: pcd =3D Pcds[pcdname] Pcds[pcdname].SkuInfoList =3D {skuid:pcd.SkuInfoList[skuid= ] for skuid in pcd.SkuInfoList if skuid in available_sku} - if type(pcd) is StructurePcd and pcd.SkuOverrideValues: + if isinstance(pcd, 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): @@ -965,7 +965,7 @@ class DscBuildData(PlatformBuildClassObject): def __ParsePcdFromCommandLine(self): if GlobalData.BuildOptionPcd: for i, pcd in enumerate(GlobalData.BuildOptionPcd): - if type(pcd) is tuple: + if isinstance(pcd, tuple): continue (pcdname, pcdvalue) =3D pcd.split('=3D') if not pcdvalue: @@ -1321,7 +1321,7 @@ class DscBuildData(PlatformBuildClassObject): 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: + if isinstance(self._DecPcds[Pcd], StructurePcd): if Pcd not in S_pcd_set: str_pcd_obj_str =3D StructurePcd() str_pcd_obj_str.copy(self._DecPcds[Pcd]) diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index ef2caf3b99bc..b05d381bdf1a 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -79,10 +79,10 @@ def ParseMacro(Parser): # # First judge whether this DEFINE is in conditional directive = statements or not. # - if type(self) =3D=3D DscParser and self._InDirective > -1: + if isinstance(self, DscParser) and self._InDirective > -1: pass else: - if type(self) =3D=3D DecParser: + if isinstance(self, DecParser): if MODEL_META_DATA_HEADER in self._SectionType: self._FileLocalMacros[Name] =3D Value else: @@ -93,7 +93,7 @@ def ParseMacro(Parser): self._ConstructSectionMacroDict(Name, Value) =20 # EDK_GLOBAL defined macros - elif type(self) !=3D DscParser: + elif not isinstance(self, DscParser): EdkLogger.error('Parser', FORMAT_INVALID, "EDK_GLOBAL can only= be used in .dsc file", ExtraData=3Dself._CurrentLine, File=3Dself.Met= aFile, Line=3Dself._LineIndex + 1) elif self._SectionType !=3D MODEL_META_DATA_HEADER: @@ -234,7 +234,7 @@ class MetaFileParser(object): # DataInfo =3D [data_type, scope1(arch), scope2(platform/moduletype)] # def __getitem__(self, DataInfo): - if type(DataInfo) !=3D type(()): + if not isinstance(DataInfo, type(())): DataInfo =3D (DataInfo,) =20 # Parse the file first, if necessary @@ -276,7 +276,7 @@ class MetaFileParser(object): TokenList =3D GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT) self._ValueList[0:len(TokenList)] =3D TokenList # Don't do macro replacement for dsc file at this point - if type(self) !=3D DscParser: + if not isinstance(self, DscParser): Macros =3D self._Macros self._ValueList =3D [ReplaceMacro(Value, Macros) for Value in = self._ValueList] =20 @@ -383,7 +383,7 @@ class MetaFileParser(object): EdkLogger.error('Parser', FORMAT_INVALID, "Invalid version= number", ExtraData=3Dself._CurrentLine, File=3Dself= .MetaFile, Line=3Dself._LineIndex + 1) =20 - if type(self) =3D=3D InfParser and self._Version < 0x00010005: + if isinstance(self, InfParser) and self._Version < 0x00010005: # EDK module allows using defines as macros self._FileLocalMacros[Name] =3D Value self._Defines[Name] =3D Value @@ -399,7 +399,7 @@ class MetaFileParser(object): self._ValueList[1] =3D TokenList2[1] # keys else: self._ValueList[1] =3D TokenList[0] - if len(TokenList) =3D=3D 2 and type(self) !=3D DscParser: # value + if len(TokenList) =3D=3D 2 and not isinstance(self, DscParser): # = value self._ValueList[2] =3D ReplaceMacro(TokenList[1], self._Macros) =20 if self._ValueList[1].count('_') !=3D 4: @@ -427,7 +427,7 @@ class MetaFileParser(object): # DecParser SectionType is a list, will contain more than one item= only in Pcd Section # As Pcd section macro usage is not alllowed, so here it is safe # - if type(self) =3D=3D DecParser: + if isinstance(self, DecParser): SectionDictKey =3D self._SectionType[0], ScopeKey else: SectionDictKey =3D self._SectionType, ScopeKey @@ -444,7 +444,7 @@ class MetaFileParser(object): SpeSpeMacroDict =3D {} =20 ActiveSectionType =3D self._SectionType - if type(self) =3D=3D DecParser: + if isinstance(self, DecParser): ActiveSectionType =3D self._SectionType[0] =20 for (SectionType, Scope) in self._SectionsMacroDict: @@ -1250,7 +1250,7 @@ class DscParser(MetaFileParser): Macros.update(self._Symbols) if GlobalData.BuildOptionPcd: for Item in GlobalData.BuildOptionPcd: - if type(Item) is tuple: + if isinstance(Item, tuple): continue PcdName, TmpValue =3D Item.split("=3D") TmpValue =3D BuildOptionValue(TmpValue, self._GuidDict) diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sourc= e/Python/build/BuildReport.py index 454ea7d088b4..c9648a9299dd 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -1865,8 +1865,7 @@ class FdRegionReport(object): for Match in gOffsetGuidPattern.finditer(FvReport): Guid =3D Match.group(2).upper() OffsetInfo[Match.group(1)] =3D self._GuidsDb.get(Guid,= Guid) - OffsetList =3D OffsetInfo.keys() - OffsetList.sort() + OffsetList =3D sorted(OffsetInfo.keys()) for Offset in OffsetList: FileWrite (File, "%s %s" % (Offset, OffsetInfo[Offset]= )) except IOError: diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index 49869d9ee4e6..bf1f853d56be 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -305,7 +305,7 @@ def LaunchCommand(Command, WorkingDir): if EndOfProcedure is not None: EndOfProcedure.set() if Proc is None: - if type(Command) !=3D type(""): + if not isinstance(Command, type("")): Command =3D " ".join(Command) EdkLogger.error("build", COMMAND_FAILURE, "Failed to start com= mand", ExtraData=3D"%s [%s]" % (Command, WorkingDir)) =20 @@ -316,7 +316,7 @@ def LaunchCommand(Command, WorkingDir): =20 # check the return code of the program if Proc.returncode !=3D 0: - if type(Command) !=3D type(""): + if not isinstance(Command, type("")): Command =3D " ".join(Command) # print out the Response file and its content when make failure RespFile =3D os.path.join(WorkingDir, 'OUTPUT', 'respfilelist.txt') diff --git a/BaseTools/gcc/mingw-gcc-build.py b/BaseTools/gcc/mingw-gcc-bui= ld.py index 3bf524123d0f..6a805ce51885 100755 --- a/BaseTools/gcc/mingw-gcc-build.py +++ b/BaseTools/gcc/mingw-gcc-build.py @@ -258,9 +258,9 @@ class SourceFiles: replaceables =3D ('extract-dir', 'filename', 'url') for replaceItem in fdata: if replaceItem in replaceables: continue - if type(fdata[replaceItem]) !=3D str: continue + if not isinstance(fdata[replaceItem], str): continue for replaceable in replaceables: - if type(fdata[replaceable]) !=3D str: continue + if not isinstance(fdata[replaceable], str): continue if replaceable in fdata: fdata[replaceable] =3D \ fdata[replaceable].replace( --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556329238588.7057277909817; Wed, 20 Jun 2018 21:45:29 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 809F0211D56BB; Wed, 20 Jun 2018 21:44:49 -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 9655E2097F544 for ; Wed, 20 Jun 2018 21:44:47 -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:44 +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:41 +0800 Message-Id: <20180621044346.28495-16-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 15/20] BaseTools: Replace StringIO.StringIO with io.BytesIO 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" Replace StringIO.StringIO with io.BytesIO to be compatible with python3. This commit also removes "import StringIO" from those python scripts that don't really use it. Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Scripts/ConvertUni.py | 5 ----- BaseTools/Source/Python/AutoGen/AutoGen.py | 10 +++++----- BaseTools/Source/Python/AutoGen/GenDepex.py | 4 ++-- BaseTools/Source/Python/AutoGen/GenPcdDb.py | 4 ++-- BaseTools/Source/Python/AutoGen/IdfClassObject.py | 1 - BaseTools/Source/Python/AutoGen/StrGather.py | 4 ++-- BaseTools/Source/Python/AutoGen/UniClassObject.py | 6 +++--- BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py | 4 ++-- BaseTools/Source/Python/BPDG/GenVpd.py | 6 +++--- BaseTools/Source/Python/GenFds/AprioriSection.py | 4 ++-- BaseTools/Source/Python/GenFds/Capsule.py | 10 +++++----- BaseTools/Source/Python/GenFds/CapsuleData.py | 4 ++-- BaseTools/Source/Python/GenFds/Fd.py | 6 +++--- BaseTools/Source/Python/GenFds/FfsFileStatement.py | 4 ++-- BaseTools/Source/Python/GenFds/FfsInfStatement.py | 4 ++-- BaseTools/Source/Python/GenFds/Fv.py | 6 +++--- BaseTools/Source/Python/GenFds/FvImageSection.py | 4 ++-- BaseTools/Source/Python/GenFds/GenFds.py | 8 ++++---- BaseTools/Source/Python/GenFds/OptionRom.py | 3 --- BaseTools/Source/Python/GenFds/Region.py | 11 ++++++----- BaseTools/Source/Python/Trim/Trim.py | 6 +++--- BaseTools/Source/Python/build/BuildReport.py | 4 ++-- BaseTools/Source/Python/build/build.py | 8 ++++---- 23 files changed, 59 insertions(+), 67 deletions(-) diff --git a/BaseTools/Scripts/ConvertUni.py b/BaseTools/Scripts/ConvertUni= .py index 2af55dfc6702..67bbe41b1f18 100755 --- a/BaseTools/Scripts/ConvertUni.py +++ b/BaseTools/Scripts/ConvertUni.py @@ -23,11 +23,6 @@ import codecs import os import sys =20 -try: - from io import StringIO -except ImportError: - from StringIO import StringIO - class ConvertOneArg: """Converts utf-16 to utf-8 for one command line argument. =20 diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index 94c5b80cb23b..8fa5c6f306f3 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -26,7 +26,7 @@ import uuid import GenC import GenMake import GenDepex -from StringIO import StringIO +from io import BytesIO =20 from StrGather import * from BuildEngine import BuildRule @@ -3438,8 +3438,8 @@ class ModuleAutoGen(AutoGen): def _GetAutoGenFileList(self): UniStringAutoGenC =3D True IdfStringAutoGenC =3D True - UniStringBinBuffer =3D StringIO() - IdfGenBinBuffer =3D StringIO() + UniStringBinBuffer =3D BytesIO() + IdfGenBinBuffer =3D BytesIO() if self.BuildType =3D=3D 'UEFI_HII': UniStringAutoGenC =3D False IdfStringAutoGenC =3D False @@ -3714,8 +3714,8 @@ class ModuleAutoGen(AutoGen): except: 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 + # Use a instance of BytesIO to cache data + fStringIO =3D BytesIO('') =20 for Item in VfrUniOffsetList: if (Item[0].find("Strings") !=3D -1): diff --git a/BaseTools/Source/Python/AutoGen/GenDepex.py b/BaseTools/Source= /Python/AutoGen/GenDepex.py index e89191a72b9f..d3b1eae181c2 100644 --- a/BaseTools/Source/Python/AutoGen/GenDepex.py +++ b/BaseTools/Source/Python/AutoGen/GenDepex.py @@ -17,7 +17,7 @@ import Common.LongFilePathOs as os import re import traceback from Common.LongFilePathSupport import OpenLongFilePath as open -from StringIO import StringIO +from io import BytesIO from struct import pack from Common.BuildToolError import * from Common.Misc import SaveFileOnChange @@ -345,7 +345,7 @@ class DependencyExpression: # @retval False If file exists and is not changed. # def Generate(self, File=3DNone): - Buffer =3D StringIO() + Buffer =3D BytesIO() if len(self.PostfixNotation) =3D=3D 0: return False =20 diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source= /Python/AutoGen/GenPcdDb.py index 35c709fa71f9..d3790cc42cca 100644 --- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py +++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # from builtins import range -from StringIO import StringIO +from io import BytesIO from Common.Misc import * from Common.StringUtils import StringToArray from struct import pack @@ -889,7 +889,7 @@ def CreatePcdDatabaseCode (Info, AutoGenC, AutoGenH): DbFileName =3D os.path.join(Info.PlatformInfo.BuildDir, TAB_FV_DIR= ECTORY, Phase + "PcdDataBase.raw") else: DbFileName =3D os.path.join(Info.OutputDir, Phase + "PcdDataBase.r= aw") - DbFile =3D StringIO() + DbFile =3D BytesIO() DbFile.write(PcdDbBuffer) Changed =3D SaveFileOnChange(DbFileName, DbFile.getvalue(), True) def CreatePcdDataBase(PcdDBData): diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/= Source/Python/AutoGen/IdfClassObject.py index e5b933c2036f..b656bd83e3ba 100644 --- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py +++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py @@ -14,7 +14,6 @@ # Import Modules # import Common.EdkLogger as EdkLogger -import StringIO from Common.BuildToolError import * from Common.StringUtils import GetLineNo from Common.Misc import PathClass diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Sourc= e/Python/AutoGen/StrGather.py index 9620a5f2ea71..77b7aaa31a0a 100644 --- a/BaseTools/Source/Python/AutoGen/StrGather.py +++ b/BaseTools/Source/Python/AutoGen/StrGather.py @@ -19,7 +19,7 @@ import re import Common.EdkLogger as EdkLogger from Common.BuildToolError import * from UniClassObject import * -from StringIO import StringIO +from io import BytesIO from struct import pack, unpack from Common.LongFilePathSupport import OpenLongFilePath as open =20 @@ -342,7 +342,7 @@ def CreateCFileContent(BaseName, UniObjectClass, IsComp= atibleMode, UniBinBuffer, if Language not in UniLanguageListFiltered: continue =20 - StringBuffer =3D StringIO() + StringBuffer =3D BytesIO() StrStringValue =3D '' ArrayLength =3D 0 NumberOfUseOtherLangDef =3D 0 diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/= Source/Python/AutoGen/UniClassObject.py index 438f3394d55b..c7dd510a20de 100644 --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py @@ -21,7 +21,7 @@ from builtins import range import Common.LongFilePathOs as os, codecs, re import distutils.util import Common.EdkLogger as EdkLogger -import StringIO +from io import BytesIO from Common.BuildToolError import * from Common.StringUtils import GetLineNo from Common.Misc import PathClass @@ -321,7 +321,7 @@ class UniFileClassObject(object): =20 UniFileClassObject.VerifyUcs2Data(FileIn, FileName, Encoding) =20 - UniFile =3D StringIO.StringIO(FileIn) + UniFile =3D BytesIO(FileIn) Info =3D codecs.lookup(Encoding) (Reader, Writer) =3D (Info.streamreader, Info.streamwriter) return codecs.StreamReaderWriter(UniFile, Reader, Writer) @@ -336,7 +336,7 @@ class UniFileClassObject(object): FileDecoded =3D codecs.decode(FileIn, Encoding) Ucs2Info.encode(FileDecoded) except: - UniFile =3D StringIO.StringIO(FileIn) + UniFile =3D BytesIO(FileIn) Info =3D codecs.lookup(Encoding) (Reader, Writer) =3D (Info.streamreader, Info.streamwriter) File =3D codecs.StreamReaderWriter(UniFile, Reader, Writer) diff --git a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py b/B= aseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py index 20356c6bcfab..e6cbf449ec8a 100644 --- a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py +++ b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py @@ -18,7 +18,7 @@ from builtins import range import os from Common.RangeExpression import RangeExpression from Common.Misc import * -from StringIO import StringIO +from io import BytesIO from struct import pack from Common.DataType import * =20 @@ -163,7 +163,7 @@ class VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER(object): Buffer +=3D b realLength +=3D 1 =20 - DbFile =3D StringIO() + DbFile =3D BytesIO() if Phase =3D=3D 'DXE' and os.path.exists(BinFilePath): BinFile =3D open(BinFilePath, "rb") BinBuffer =3D BinFile.read() diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/Source/Pyth= on/BPDG/GenVpd.py index 6dbc2c421730..83acac1f9ae0 100644 --- a/BaseTools/Source/Python/BPDG/GenVpd.py +++ b/BaseTools/Source/Python/BPDG/GenVpd.py @@ -15,7 +15,7 @@ =20 from builtins import range import Common.LongFilePathOs as os -import StringIO +from io import BytesIO import StringTable as st import array import re @@ -674,8 +674,8 @@ class GenVPD : # Open failed EdkLogger.error("BPDG", BuildToolError.FILE_OPEN_FAILURE, "Fil= e open failed for %s" % self.MapFileName, None) =20 - # Use a instance of StringIO to cache data - fStringIO =3D StringIO.StringIO('') + # Use a instance of BytesIO to cache data + fStringIO =3D BytesIO('') =20 # Write the header of map file. try : diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/S= ource/Python/GenFds/AprioriSection.py index 1288349c7c4b..5d1e56b7f1da 100644 --- a/BaseTools/Source/Python/GenFds/AprioriSection.py +++ b/BaseTools/Source/Python/GenFds/AprioriSection.py @@ -18,7 +18,7 @@ from builtins import range from struct import * import Common.LongFilePathOs as os -import StringIO +from io import BytesIO import FfsFileStatement from GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import AprioriSectionClassObject @@ -52,7 +52,7 @@ class AprioriSection (AprioriSectionClassObject): def GenFfs (self, FvName, Dict =3D {}, IsMakefile =3D False): DXE_GUID =3D "FC510EE7-FFDC-11D4-BD41-0080C73C8881" PEI_GUID =3D "1B45CC0A-156A-428A-AF62-49864DA0E6E6" - Buffer =3D StringIO.StringIO('') + Buffer =3D BytesIO('') AprioriFileGuid =3D DXE_GUID if self.AprioriType =3D=3D "PEI": AprioriFileGuid =3D PEI_GUID diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/P= ython/GenFds/Capsule.py index fbd48f3c6d76..b02661d99855 100644 --- a/BaseTools/Source/Python/GenFds/Capsule.py +++ b/BaseTools/Source/Python/GenFds/Capsule.py @@ -19,7 +19,7 @@ from GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import CapsuleClassObject import Common.LongFilePathOs as os import subprocess -import StringIO +from io import BytesIO from Common.Misc import SaveFileOnChange from GenFds import GenFds from Common.Misc import PackRegistryFormatGuid @@ -66,7 +66,7 @@ class Capsule (CapsuleClassObject) : # UINT32 CapsuleImageSize; # } EFI_CAPSULE_HEADER; # - Header =3D StringIO.StringIO() + Header =3D BytesIO() # # Use FMP capsule GUID: 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A # @@ -97,7 +97,7 @@ class Capsule (CapsuleClassObject) : # // UINT64 ItemOffsetList[]; # } EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER; # - FwMgrHdr =3D StringIO.StringIO() + FwMgrHdr =3D BytesIO() if 'CAPSULE_HEADER_INIT_VERSION' in self.TokensDict: FwMgrHdr.write(pack('=3DI', int(self.TokensDict['CAPSULE_HEADE= R_INIT_VERSION'], 16))) else: @@ -132,7 +132,7 @@ class Capsule (CapsuleClassObject) : # =20 PreSize =3D FwMgrHdrSize - Content =3D StringIO.StringIO() + Content =3D BytesIO() for driver in self.CapsuleDataList: FileName =3D driver.GenCapsuleSubItem() FwMgrHdr.write(pack('=3DQ', PreSize)) @@ -247,7 +247,7 @@ class Capsule (CapsuleClassObject) : def GenCapInf(self): self.CapInfFileName =3D os.path.join(GenFdsGlobalVariable.FvDir, self.UiCapsuleName + "_Cap" + '.inf') - CapInfFile =3D StringIO.StringIO() #open (self.CapInfFileName , 'w= +') + CapInfFile =3D BytesIO() #open (self.CapInfFileName , 'w+') =20 CapInfFile.writelines("[options]" + T_CHAR_LF) =20 diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Sour= ce/Python/GenFds/CapsuleData.py index 9dc55e5dbf7b..83b2731110bc 100644 --- a/BaseTools/Source/Python/GenFds/CapsuleData.py +++ b/BaseTools/Source/Python/GenFds/CapsuleData.py @@ -17,7 +17,7 @@ # import Ffs from GenFdsGlobalVariable import GenFdsGlobalVariable -import StringIO +from io import BytesIO from struct import pack import os from Common.Misc import SaveFileOnChange @@ -82,7 +82,7 @@ class CapsuleFv (CapsuleData): if self.FvName.find('.fv') =3D=3D -1: if self.FvName.upper() in GenFdsGlobalVariable.FdfParser.Profi= le.FvDict: FvObj =3D GenFdsGlobalVariable.FdfParser.Profile.FvDict[se= lf.FvName.upper()] - FdBuffer =3D StringIO.StringIO('') + FdBuffer =3D BytesIO('') FvObj.CapsuleName =3D self.CapsuleName FvFile =3D FvObj.AddToBuffer(FdBuffer) FvObj.CapsuleName =3D None diff --git a/BaseTools/Source/Python/GenFds/Fd.py b/BaseTools/Source/Python= /GenFds/Fd.py index b2a14a1e1313..3305a470edfa 100644 --- a/BaseTools/Source/Python/GenFds/Fd.py +++ b/BaseTools/Source/Python/GenFds/Fd.py @@ -18,7 +18,7 @@ import Region import Fv import Common.LongFilePathOs as os -import StringIO +from io import BytesIO import sys from struct import * from GenFdsGlobalVariable import GenFdsGlobalVariable @@ -75,7 +75,7 @@ class FD(FDClassObject): HasCapsuleRegion =3D True break if HasCapsuleRegion: - TempFdBuffer =3D StringIO.StringIO('') + TempFdBuffer =3D BytesIO('') PreviousRegionStart =3D -1 PreviousRegionSize =3D 1 =20 @@ -104,7 +104,7 @@ class FD(FDClassObject): GenFdsGlobalVariable.VerboseLogger('Call each region\'s Ad= dToBuffer function') RegionObj.AddToBuffer (TempFdBuffer, self.BaseAddress, sel= f.BlockSizeList, self.ErasePolarity, GenFds.ImageBinDict, self.vtfRawDict, = self.DefineVarDict) =20 - FdBuffer =3D StringIO.StringIO('') + FdBuffer =3D BytesIO('') PreviousRegionStart =3D -1 PreviousRegionSize =3D 1 for RegionObj in self.RegionList : diff --git a/BaseTools/Source/Python/GenFds/FfsFileStatement.py b/BaseTools= /Source/Python/GenFds/FfsFileStatement.py index c3bccb47be2c..74c4b3d8adb6 100644 --- a/BaseTools/Source/Python/GenFds/FfsFileStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsFileStatement.py @@ -19,7 +19,7 @@ from builtins import range import Ffs import Rule import Common.LongFilePathOs as os -import StringIO +from io import BytesIO import subprocess =20 from GenFdsGlobalVariable import GenFdsGlobalVariable @@ -83,7 +83,7 @@ class FileStatement (FileStatementClassObject) : Dict.update(self.DefineVarDict) SectionAlignments =3D None if self.FvName is not None : - Buffer =3D StringIO.StringIO('') + Buffer =3D BytesIO('') if self.FvName.upper() not in GenFdsGlobalVariable.FdfParser.P= rofile.FvDict: EdkLogger.error("GenFds", GENFDS_ERROR, "FV (%s) is NOT de= scribed in FDF file!" % (self.FvName)) Fv =3D GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.= FvName.upper()) diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/= Source/Python/GenFds/FfsInfStatement.py index 9eb99d659bfd..ef34dbf00754 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -18,7 +18,7 @@ # import Rule import Common.LongFilePathOs as os -import StringIO +from io import BytesIO from struct import * from GenFdsGlobalVariable import GenFdsGlobalVariable import Ffs @@ -1088,7 +1088,7 @@ class FfsInfStatement(FfsInfStatementClassObject): def __GenUniVfrOffsetFile(VfrUniOffsetList, UniVfrOffsetFileName): =20 # Use a instance of StringIO to cache data - fStringIO =3D StringIO.StringIO('') =20 + fStringIO =3D BytesIO('') =20 for Item in VfrUniOffsetList: if (Item[0].find("Strings") !=3D -1): diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python= /GenFds/Fv.py index 93bf05e40667..31ae60396556 100644 --- a/BaseTools/Source/Python/GenFds/Fv.py +++ b/BaseTools/Source/Python/GenFds/Fv.py @@ -18,7 +18,7 @@ from builtins import range import Common.LongFilePathOs as os import subprocess -import StringIO +from io import BytesIO from struct import * =20 import Ffs @@ -266,7 +266,7 @@ class FV (FvClassObject): # self.InfFileName =3D os.path.join(GenFdsGlobalVariable.FvDir, self.UiFvName + '.inf') - self.FvInfFile =3D StringIO.StringIO() + self.FvInfFile =3D BytesIO() =20 # # Add [Options] @@ -408,7 +408,7 @@ class FV (FvClassObject): # if TotalSize > 0: FvExtHeaderFileName =3D os.path.join(GenFdsGlobalVariable.= FvDir, self.UiFvName + '.ext') - FvExtHeaderFile =3D StringIO.StringIO() + FvExtHeaderFile =3D BytesIO() FvExtHeaderFile.write(Buffer) Changed =3D SaveFileOnChange(FvExtHeaderFileName, FvExtHea= derFile.getvalue(), True) FvExtHeaderFile.close() diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/S= ource/Python/GenFds/FvImageSection.py index 77bf6a700623..b4f1f3340e99 100644 --- a/BaseTools/Source/Python/GenFds/FvImageSection.py +++ b/BaseTools/Source/Python/GenFds/FvImageSection.py @@ -16,7 +16,7 @@ # Import Modules # import Section -import StringIO +from io import BytesIO from Ffs import Ffs import subprocess from GenFdsGlobalVariable import GenFdsGlobalVariable @@ -98,7 +98,7 @@ class FvImageSection(FvImageSectionClassObject): # Generate Fv # if self.FvName is not None: - Buffer =3D StringIO.StringIO('') + Buffer =3D BytesIO('') Fv =3D GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.= FvName) if Fv is not None: self.Fv =3D Fv diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Py= thon/GenFds/GenFds.py index 1abebea5fdc6..04fc17906a57 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -28,7 +28,7 @@ from Workspace.WorkspaceDatabase import WorkspaceDatabase from Workspace.BuildClassObject import PcdClassObject import RuleComplexFile from EfiSection import EfiSection -import StringIO +from io import BytesIO import Common.TargetTxtClassObject as TargetTxtClassObject import Common.ToolDefClassObject as ToolDefClassObject from Common.DataType import * @@ -543,13 +543,13 @@ class GenFds : if GenFds.OnlyGenerateThisFv is not None and GenFds.OnlyGenerateTh= isFv.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict: FvObj =3D GenFdsGlobalVariable.FdfParser.Profile.FvDict[GenFds= .OnlyGenerateThisFv.upper()] if FvObj is not None: - Buffer =3D StringIO.StringIO() + Buffer =3D BytesIO() FvObj.AddToBuffer(Buffer) Buffer.close() return elif GenFds.OnlyGenerateThisFv is None: for FvObj in GenFdsGlobalVariable.FdfParser.Profile.FvDict.val= ues(): - Buffer =3D StringIO.StringIO('') + Buffer =3D BytesIO('') FvObj.AddToBuffer(Buffer) Buffer.close() =20 @@ -695,7 +695,7 @@ class GenFds : =20 def GenerateGuidXRefFile(BuildDb, ArchList, FdfParserObj): GuidXRefFileName =3D os.path.join(GenFdsGlobalVariable.FvDir, "Gui= d.xref") - GuidXRefFile =3D StringIO.StringIO('') + GuidXRefFile =3D BytesIO('') GuidDict =3D {} ModuleList =3D [] FileGuidList =3D [] diff --git a/BaseTools/Source/Python/GenFds/OptionRom.py b/BaseTools/Source= /Python/GenFds/OptionRom.py index b05841529940..755eb01da7e1 100644 --- a/BaseTools/Source/Python/GenFds/OptionRom.py +++ b/BaseTools/Source/Python/GenFds/OptionRom.py @@ -17,7 +17,6 @@ # import Common.LongFilePathOs as os import subprocess -import StringIO =20 import OptRomInfStatement from GenFdsGlobalVariable import GenFdsGlobalVariable @@ -138,5 +137,3 @@ class OverrideAttribs: self.PciDeviceId =3D None self.PciRevision =3D None self.NeedCompress =3D None - =20 - =20 \ No newline at end of file diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Py= thon/GenFds/Region.py index a662692ad5d4..1b127345bcfb 100644 --- a/BaseTools/Source/Python/GenFds/Region.py +++ b/BaseTools/Source/Python/GenFds/Region.py @@ -18,7 +18,7 @@ from builtins import range from struct import * from GenFdsGlobalVariable import GenFdsGlobalVariable -import StringIO +from io import BytesIO import string from CommonDataClass.FdfClass import RegionClassObject import Common.LongFilePathOs as os @@ -128,7 +128,7 @@ class Region(RegionClassObject): if self.FvAddress % FvAlignValue !=3D 0: EdkLogger.error("GenFds", GENFDS_ERROR, "FV (%s) is NOT %s Aligned!" %= (FvObj.UiFvName, FvObj.FvAlignment)) - FvBuffer =3D StringIO.StringIO('') + FvBuffer =3D BytesIO('') FvBaseAddress =3D '0x%X' % self.FvAddress BlockSize =3D None BlockNum =3D None @@ -136,7 +136,8 @@ class Region(RegionClassObject): if Flag: continue =20 - if FvBuffer.len > Size: + FvBufferLen =3D len(FvBuffer.getvalue()) + if FvBufferLen > Size: FvBuffer.close() EdkLogger.error("GenFds", GENFDS_ERROR, "Size of FV (%s) is larger tha= n Region Size 0x%X specified." % (RegionData, Size)) @@ -145,8 +146,8 @@ class Region(RegionClassObject): # Buffer.write(FvBuffer.getvalue()) FvBuffer.close() - FvOffset =3D FvOffset + FvBuffer.len - Size =3D Size - FvBuffer.len + FvOffset =3D FvOffset + FvBufferLen + Size =3D Size - FvBufferLen continue else: EdkLogger.error("GenFds", GENFDS_ERROR, "FV (%s) i= s NOT described in FDF file!" % (RegionData)) diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python= /Trim/Trim.py index d725e7ad2da0..e7f69db0beab 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -18,7 +18,7 @@ from builtins import range import Common.LongFilePathOs as os import sys import re -import StringIO +from io import BytesIO =20 from optparse import OptionParser from optparse import make_option @@ -456,8 +456,8 @@ def GenerateVfrBinSec(ModuleName, DebugDir, OutputFile): except: EdkLogger.error("Trim", FILE_OPEN_FAILURE, "File open failed for %= s" %OutputFile, None) =20 - # Use a instance of StringIO to cache data - fStringIO =3D StringIO.StringIO('') + # Use a instance of BytesIO to cache data + fStringIO =3D BytesIO('') =20 for Item in VfrUniOffsetList: if (Item[0].find("Strings") !=3D -1): diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sourc= e/Python/build/BuildReport.py index c9648a9299dd..897167cd11d6 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -28,7 +28,7 @@ import hashlib import subprocess import threading from datetime import datetime -from StringIO import StringIO +from io import BytesIO from Common import EdkLogger from Common.Misc import SaveFileOnChange from Common.Misc import GuidStructureByteArrayToGuidString @@ -2169,7 +2169,7 @@ class BuildReport(object): def GenerateReport(self, BuildDuration, AutoGenTime, MakeTime, GenFdsT= ime): if self.ReportFile: try: - File =3D StringIO('') + File =3D BytesIO('') for (Wa, MaList) in self.ReportList: PlatformReport(Wa, MaList, self.ReportType).GenerateRe= port(File, BuildDuration, AutoGenTime, MakeTime, GenFdsTime, self.ReportTyp= e) Content =3D FileLinesSplit(File.getvalue(), gLineMaxLength) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index bf1f853d56be..08e81016de8b 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -19,7 +19,7 @@ from __future__ import print_function import Common.LongFilePathOs as os import re -import StringIO +from io import BytesIO import sys import glob import time @@ -1782,7 +1782,7 @@ class Build(): if not Ma.IsLibrary: ModuleList[Ma.Guid.upper()] =3D Ma =20 - MapBuffer =3D StringIO('') + MapBuffer =3D BytesIO('') if self.LoadFixAddress !=3D 0: # # Rebase module to the preferred memory address be= fore GenFds @@ -1940,7 +1940,7 @@ class Build(): if not Ma.IsLibrary: ModuleList[Ma.Guid.upper()] =3D Ma =20 - MapBuffer =3D StringIO('') + MapBuffer =3D BytesIO('') if self.LoadFixAddress !=3D 0: # # Rebase module to the preferred memory address be= fore GenFds @@ -2127,7 +2127,7 @@ class Build(): # # Rebase module to the preferred memory address before= GenFds # - MapBuffer =3D StringIO('') + MapBuffer =3D BytesIO('') if self.LoadFixAddress !=3D 0: self._CollectModuleMapBuffer(MapBuffer, ModuleList) =20 --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556333592752.1886162110326; Wed, 20 Jun 2018 21:45:33 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B41DC211D5079; Wed, 20 Jun 2018 21:44:51 -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 7866A211D505C for ; Wed, 20 Jun 2018 21:44:49 -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:46 +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:42 +0800 Message-Id: <20180621044346.28495-17-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 16/20] BaseTools: Treat GenFds.py and build.py as python modules 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" Since GenFds.py and build.py import modules from its own directory, add "-m" to the python parameters so that they can import its own modules. Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/BinWrappers/PosixLike/GenFds | 2 +- BaseTools/BinWrappers/PosixLike/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/BinWrappers/PosixLike/GenFds b/BaseTools/BinWrappers= /PosixLike/GenFds index 01ae23ddeb4f..276c7ea20733 100755 --- a/BaseTools/BinWrappers/PosixLike/GenFds +++ b/BaseTools/BinWrappers/PosixLike/GenFds @@ -11,4 +11,4 @@ dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/} =20 export PYTHONPATH=3D"$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}" -exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" +exec "${python_exe:-python}" -m $cmd.$cmd "$@" diff --git a/BaseTools/BinWrappers/PosixLike/build b/BaseTools/BinWrappers/= PosixLike/build index 01ae23ddeb4f..276c7ea20733 100755 --- a/BaseTools/BinWrappers/PosixLike/build +++ b/BaseTools/BinWrappers/PosixLike/build @@ -11,4 +11,4 @@ dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/} =20 export PYTHONPATH=3D"$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}" -exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" +exec "${python_exe:-python}" -m $cmd.$cmd "$@" --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 152955633765566.17301366952427; Wed, 20 Jun 2018 21:45:37 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E81D8211D56C3; Wed, 20 Jun 2018 21:44:53 -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 A8E44211D56BE for ; Wed, 20 Jun 2018 21:44:51 -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:48 +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:43 +0800 Message-Id: <20180621044346.28495-18-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 17/20] BaseTools: Adopt absolute import for python scripts 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 libfuturize.fixes.fix_absolute_import" Since circular import is not allowed after adopting absolute import, the following changes are applied to break the circles. * BaseTools/Source/Python/GenFds/Capsule.py - Delay "from .GenFds import GenFds" until GenCapsule() - Delay "from .GenFds import FindExtendTool" until GenFmpCapsule() To break the circle: AutoGen.AutoGen =3D> GenFds.FdfParser =3D> GenFds.Capsule =3D> GenFds.Gen= Fds =3D> GenFds.FdfParser * BaseTools/Source/Python/GenFds/Fd.py - Delay "from .GenFds import GenFds" until GenFd() To break the circle: AutoGen.AutoGen =3D> GenFds.FdfParser =3D> GenFds.Fd =3D> GenFds.GenFds = =3D> GenFds.FdfParser * BaseTools/Source/Python/GenFds/Fv.py - Delay "from .GenFds import GenFds" until AddToBuffer() To break the circle: AutoGen.AutoGen =3D> GenFds.FdfParser =3D> GenFds.Fd =3D> GenFds.Fv =3D> GenFds.GenFds =3D> GenFds.FdfParser * BaseTools/Source/Python/GenFds/GuidSection.py - Delay "from .GenFds import FindExtendTool" until GuidSection() To break the circle: AutoGen.AutoGen =3D> GenFds.FdfParser =3D> GenFds.Fd =3D> GenFds.Fv =3D> GenFds.AprioriSection =3D> GenFds.FfsFileStatement =3D> GenFds.GuidSectio= n =3D> GenFds.GenFds =3D> GenFds.FdfParser * BaseTools/Source/Python/GenFds/OptRomInfStatement.py - Delay "from . import OptionRom" until __GetOptRomParams() To break the circle: AutoGen.AutoGen =3D> GenFds.FdfParser =3D> GenFds.OptionRom =3D> GenFds.OptRomInfStatement =3D> GenFds.OptionRom * BaseTools/Source/Python/GenFds/OptionRom.py - Remove the unused "from .GenFds import GenFds" To break the circle: AutoGen.AutoGen =3D> GenFds.FdfParser =3D> GenFds.OptionRom =3D> GenFds.GenFds =3D> GenFds.FdfParser Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py = | 5 +- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxyge= n.py | 3 +- BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py= | 3 +- BaseTools/Source/Python/AutoGen/AutoGen.py = | 17 +++--- BaseTools/Source/Python/AutoGen/GenC.py = | 7 +-- BaseTools/Source/Python/AutoGen/GenMake.py = | 3 +- BaseTools/Source/Python/AutoGen/GenPcdDb.py = | 7 +-- BaseTools/Source/Python/AutoGen/IdfClassObject.py = | 3 +- BaseTools/Source/Python/AutoGen/StrGather.py = | 3 +- BaseTools/Source/Python/BPDG/BPDG.py = | 5 +- BaseTools/Source/Python/BPDG/GenVpd.py = | 3 +- BaseTools/Source/Python/Common/Database.py = | 9 ++-- BaseTools/Source/Python/Common/EdkLogger.py = | 3 +- BaseTools/Source/Python/Common/Expression.py = | 3 +- BaseTools/Source/Python/Common/LongFilePathOs.py = | 3 +- BaseTools/Source/Python/Common/Misc.py = | 9 ++-- BaseTools/Source/Python/Common/Parsing.py = | 5 +- BaseTools/Source/Python/Common/StringUtils.py = | 9 ++-- BaseTools/Source/Python/Common/TargetTxtClassObject.py = | 9 ++-- BaseTools/Source/Python/Common/ToolDefClassObject.py = | 9 ++-- BaseTools/Source/Python/Ecc/CParser.py = | 5 +- BaseTools/Source/Python/Ecc/Check.py = | 9 ++-- BaseTools/Source/Python/Ecc/CodeFragmentCollector.py = | 13 ++--- BaseTools/Source/Python/Ecc/Database.py = | 7 +-- BaseTools/Source/Python/Ecc/Ecc.py = | 25 ++++----- BaseTools/Source/Python/Ecc/Exception.py = | 3 +- BaseTools/Source/Python/Ecc/FileProfile.py = | 5 +- BaseTools/Source/Python/Ecc/MetaDataParser.py = | 5 +- BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py = | 3 +- BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileTable.py = | 5 +- BaseTools/Source/Python/Ecc/c.py = | 13 ++--- BaseTools/Source/Python/Eot/CParser.py = | 5 +- BaseTools/Source/Python/Eot/CodeFragmentCollector.py = | 11 ++-- BaseTools/Source/Python/Eot/Eot.py = | 21 ++++---- BaseTools/Source/Python/Eot/FileProfile.py = | 3 +- BaseTools/Source/Python/Eot/InfParserLite.py = | 5 +- BaseTools/Source/Python/Eot/Parser.py = | 3 +- BaseTools/Source/Python/Eot/Report.py = | 3 +- BaseTools/Source/Python/Eot/c.py = | 9 ++-- BaseTools/Source/Python/GenFds/AprioriSection.py = | 5 +- BaseTools/Source/Python/GenFds/Capsule.py = | 7 +-- BaseTools/Source/Python/GenFds/CapsuleData.py = | 5 +- BaseTools/Source/Python/GenFds/CompressSection.py = | 7 +-- BaseTools/Source/Python/GenFds/DataSection.py = | 7 +-- BaseTools/Source/Python/GenFds/DepexSection.py = | 7 +-- BaseTools/Source/Python/GenFds/EfiSection.py = | 7 +-- BaseTools/Source/Python/GenFds/Fd.py = | 9 ++-- BaseTools/Source/Python/GenFds/FdfParser.py = | 55 ++++++++++---------- BaseTools/Source/Python/GenFds/FfsFileStatement.py = | 11 ++-- BaseTools/Source/Python/GenFds/FfsInfStatement.py = | 19 +++---- BaseTools/Source/Python/GenFds/Fv.py = | 11 ++-- BaseTools/Source/Python/GenFds/FvImageSection.py = | 7 +-- BaseTools/Source/Python/GenFds/GenFds.py = | 11 ++-- BaseTools/Source/Python/GenFds/GuidSection.py = | 11 ++-- BaseTools/Source/Python/GenFds/OptRomFileStatement.py = | 3 +- BaseTools/Source/Python/GenFds/OptRomInfStatement.py = | 15 +++--- BaseTools/Source/Python/GenFds/OptionRom.py = | 6 +-- BaseTools/Source/Python/GenFds/Region.py = | 3 +- BaseTools/Source/Python/GenFds/RuleComplexFile.py = | 3 +- BaseTools/Source/Python/GenFds/RuleSimpleFile.py = | 3 +- BaseTools/Source/Python/GenFds/Section.py = | 3 +- BaseTools/Source/Python/GenFds/UiSection.py = | 7 +-- BaseTools/Source/Python/GenFds/VerSection.py = | 7 +-- BaseTools/Source/Python/GenFds/Vtf.py = | 3 +- BaseTools/Source/Python/Table/TableDataModel.py = | 3 +- BaseTools/Source/Python/Table/TableDec.py = | 3 +- BaseTools/Source/Python/Table/TableDsc.py = | 3 +- BaseTools/Source/Python/Table/TableEotReport.py = | 5 +- BaseTools/Source/Python/Table/TableFdf.py = | 3 +- BaseTools/Source/Python/Table/TableFile.py = | 3 +- BaseTools/Source/Python/Table/TableFunction.py = | 3 +- BaseTools/Source/Python/Table/TableIdentifier.py = | 5 +- BaseTools/Source/Python/Table/TableInf.py = | 3 +- BaseTools/Source/Python/Table/TablePcd.py = | 5 +- BaseTools/Source/Python/Table/TableQuery.py = | 3 +- BaseTools/Source/Python/Table/TableReport.py = | 3 +- BaseTools/Source/Python/UPT/Library/Parsing.py = | 3 +- BaseTools/Source/Python/Workspace/DscBuildData.py = | 9 ++-- BaseTools/Source/Python/Workspace/InfBuildData.py = | 3 +- BaseTools/Source/Python/Workspace/MetaFileParser.py = | 5 +- BaseTools/Source/Python/Workspace/MetaFileTable.py = | 5 +- BaseTools/Source/Python/Workspace/WorkspaceCommon.py = | 3 +- BaseTools/Source/Python/Workspace/WorkspaceDatabase.py = | 7 +-- BaseTools/Source/Python/build/build.py = | 3 +- 84 files changed, 333 insertions(+), 250 deletions(-) diff --git a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py b/Bas= eTools/Scripts/PackageDocumentTools/packagedoc_cli.py index b45b5e69bc54..f2223d82d662 100644 --- a/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py +++ b/BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py @@ -13,12 +13,13 @@ # =20 from __future__ import print_function +from __future__ import absolute_import from builtins import range import os, sys, logging, traceback, subprocess from optparse import OptionParser =20 -import plugins.EdkPlugins.edk2.model.baseobject as baseobject -import plugins.EdkPlugins.edk2.model.doxygengen as doxygengen +from . import plugins.EdkPlugins.edk2.model.baseobject as baseobject +from . import plugins.EdkPlugins.edk2.model.doxygengen as doxygengen =20 gArchMarcoDict =3D {'ALL' : 'MDE_CPU_IA32 MDE_CPU_X64 MDE_CPU_EBC MDE= _CPU_IPF _MSC_EXTENSIONS __GNUC__ __INTEL_COMPILER', 'IA32_MSFT': 'MDE_CPU_IA32 _MSC_EXTENSIONS', diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/doxygen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugin= s/basemodel/doxygen.py index b5ab213cd7f0..d1e21135cf05 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/d= oxygen.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/d= oxygen.py @@ -12,9 +12,10 @@ # =20 from __future__ import print_function +from __future__ import absolute_import import os =20 -from message import * +from .message import * =20 class BaseDoxygeItem: def __init__(self, name, tag=3D''): diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/base= model/ini.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/ba= semodel/ini.py index 0e9b105b3647..61c344864e32 100644 --- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/i= ni.py +++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/i= ni.py @@ -11,8 +11,9 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from __future__ import absolute_import from builtins import range -from message import * +from .message import * import re import os =20 diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index 8fa5c6f306f3..2cc31cf95d83 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -16,6 +16,7 @@ ## Import Modules # from __future__ import print_function +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os import re @@ -23,13 +24,13 @@ import os.path as path import copy import uuid =20 -import GenC -import GenMake -import GenDepex +from . import GenC +from . import GenMake +from . import GenDepex from io import BytesIO =20 -from StrGather import * -from BuildEngine import BuildRule +from .StrGather import * +from .BuildEngine import BuildRule =20 from Common.LongFilePathSupport import CopyLongFilePath from Common.BuildToolError import * @@ -42,14 +43,14 @@ from CommonDataClass.CommonClass import SkuInfoClass from Workspace.BuildClassObject import * from GenPatchPcdTable.GenPatchPcdTable import parsePcdInfoFromMapFile import Common.VpdInfoFile as VpdInfoFile -from GenPcdDb import CreatePcdDatabaseCode +from .GenPcdDb import CreatePcdDatabaseCode from Workspace.MetaFileCommentParser import UsageList from Workspace.WorkspaceCommon import GetModuleLibInstances from Common.MultipleWorkspace import MultipleWorkspace as mws -import InfSectionParser +from . 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 diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Pyt= hon/AutoGen/GenC.py index b0af4bc88d97..8f8cb4c4a491 100644 --- a/BaseTools/Source/Python/AutoGen/GenC.py +++ b/BaseTools/Source/Python/AutoGen/GenC.py @@ -13,6 +13,7 @@ =20 ## Import Modules # +from __future__ import absolute_import from builtins import range import string import collections @@ -23,9 +24,9 @@ from Common.BuildToolError import * from Common.DataType import * from Common.Misc import * from Common.StringUtils import StringToArray -from StrGather import * -from GenPcdDb import CreatePcdDatabaseCode -from IdfClassObject import * +from .StrGather import * +from .GenPcdDb import CreatePcdDatabaseCode +from .IdfClassObject import * =20 ## PCD type string gItemTypeStringDatabase =3D { diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index f3b23ed055fb..32ebb268a670 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -13,6 +13,7 @@ =20 ## Import Modules # +from __future__ import absolute_import import Common.LongFilePathOs as os import sys import string @@ -23,7 +24,7 @@ from Common.MultipleWorkspace import MultipleWorkspace as= mws from Common.BuildToolError import * from Common.Misc import * from Common.StringUtils import * -from BuildEngine import * +from .BuildEngine import * import Common.GlobalData as GlobalData from collections import OrderedDict =20 diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source= /Python/AutoGen/GenPcdDb.py index d3790cc42cca..0f89658d3f9c 100644 --- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py +++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py @@ -10,14 +10,15 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # +from __future__ import absolute_import from builtins import range from io import BytesIO from Common.Misc import * from Common.StringUtils import StringToArray from struct import pack -from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER -from ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB -from ValidCheckingInfoObject import GetValidationObject +from .ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB_CONTAINER +from .ValidCheckingInfoObject import VAR_CHECK_PCD_VARIABLE_TAB +from .ValidCheckingInfoObject import GetValidationObject from Common.VariableAttributes import VariableAttributes import copy from struct import unpack diff --git a/BaseTools/Source/Python/AutoGen/IdfClassObject.py b/BaseTools/= Source/Python/AutoGen/IdfClassObject.py index b656bd83e3ba..b227b10258da 100644 --- a/BaseTools/Source/Python/AutoGen/IdfClassObject.py +++ b/BaseTools/Source/Python/AutoGen/IdfClassObject.py @@ -13,6 +13,7 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger from Common.BuildToolError import * from Common.StringUtils import GetLineNo @@ -21,7 +22,7 @@ from Common.LongFilePathSupport import LongFilePath import re import os from Common.GlobalData import gIdentifierPattern -from UniClassObject import StripComments +from .UniClassObject import StripComments =20 IMAGE_TOKEN =3D re.compile('IMAGE_TOKEN *\(([A-Z0-9_]+) *\)', re.MULTILINE= | re.UNICODE) =20 diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Sourc= e/Python/AutoGen/StrGather.py index 77b7aaa31a0a..8f36da83450d 100644 --- a/BaseTools/Source/Python/AutoGen/StrGather.py +++ b/BaseTools/Source/Python/AutoGen/StrGather.py @@ -14,11 +14,12 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range import re import Common.EdkLogger as EdkLogger from Common.BuildToolError import * -from UniClassObject import * +from .UniClassObject import * from io import BytesIO from struct import pack, unpack from Common.LongFilePathSupport import OpenLongFilePath as open diff --git a/BaseTools/Source/Python/BPDG/BPDG.py b/BaseTools/Source/Python= /BPDG/BPDG.py index 86c44abb67a6..83674d154a3e 100644 --- a/BaseTools/Source/Python/BPDG/BPDG.py +++ b/BaseTools/Source/Python/BPDG/BPDG.py @@ -21,6 +21,7 @@ # Import Modules # from __future__ import print_function +from __future__ import absolute_import import Common.LongFilePathOs as os import sys import encodings.ascii @@ -30,8 +31,8 @@ from Common import EdkLogger from Common.BuildToolError import * from Common.BuildVersion import gBUILD_VERSION =20 -import StringTable as st -import GenVpd +from . import StringTable as st +from . import GenVpd =20 PROJECT_NAME =3D st.LBL_BPDG_LONG_UNI VERSION =3D (st.LBL_BPDG_VERSION + " Build " + gBUILD_VERSION) diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/Source/Pyth= on/BPDG/GenVpd.py index 83acac1f9ae0..bb81330f80a9 100644 --- a/BaseTools/Source/Python/BPDG/GenVpd.py +++ b/BaseTools/Source/Python/BPDG/GenVpd.py @@ -13,10 +13,11 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IM= PLIED. # =20 +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os from io import BytesIO -import StringTable as st +from . import StringTable as st import array import re from Common.LongFilePathSupport import OpenLongFilePath as open diff --git a/BaseTools/Source/Python/Common/Database.py b/BaseTools/Source/= Python/Common/Database.py index d3340f5a9036..cc042315e5cf 100644 --- a/BaseTools/Source/Python/Common/Database.py +++ b/BaseTools/Source/Python/Common/Database.py @@ -14,13 +14,14 @@ ## # Import Modules # +from __future__ import absolute_import import sqlite3 import Common.LongFilePathOs as os =20 -import EdkLogger as EdkLogger +from . import EdkLogger as EdkLogger from CommonDataClass.DataClass import * -from StringUtils import * -from DataType import * +from .StringUtils import * +from .DataType import * =20 from Table.TableDataModel import TableDataModel from Table.TableFile import TableFile @@ -117,4 +118,4 @@ if __name__ =3D=3D '__main__': Db.QueryTable(Db.TblFile) Db.QueryTable(Db.TblDsc) Db.Close() - =20 \ No newline at end of file + =20 diff --git a/BaseTools/Source/Python/Common/EdkLogger.py b/BaseTools/Source= /Python/Common/EdkLogger.py index 3f462df49ada..19749066ecee 100644 --- a/BaseTools/Source/Python/Common/EdkLogger.py +++ b/BaseTools/Source/Python/Common/EdkLogger.py @@ -12,9 +12,10 @@ # =20 ## Import modules +from __future__ import absolute_import import Common.LongFilePathOs as os, sys, logging import traceback -from BuildToolError import * +from .BuildToolError import * =20 ## Log level constants DEBUG_0 =3D 1 diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Sourc= e/Python/Common/Expression.py index 3dbcac8daf2c..6895588da81e 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -13,11 +13,12 @@ ## Import Modules # from __future__ import print_function +from __future__ import absolute_import from builtins import range from Common.GlobalData import * from CommonDataClass.Exceptions import BadExpression from CommonDataClass.Exceptions import WrnExpression -from Misc import GuidStringToGuidStructureString, ParseFieldValue, IsField= ValueAnArray +from .Misc import GuidStringToGuidStructureString, ParseFieldValue, IsFiel= dValueAnArray import Common.EdkLogger as EdkLogger import copy from Common.DataType import * diff --git a/BaseTools/Source/Python/Common/LongFilePathOs.py b/BaseTools/S= ource/Python/Common/LongFilePathOs.py index 4939a8bc733c..53528546b782 100644 --- a/BaseTools/Source/Python/Common/LongFilePathOs.py +++ b/BaseTools/Source/Python/Common/LongFilePathOs.py @@ -11,8 +11,9 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from __future__ import absolute_import import os -import LongFilePathOsPath +from . import LongFilePathOsPath from Common.LongFilePathSupport import LongFilePath from Common.LongFilePathSupport import UniToStr import time diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Pyth= on/Common/Misc.py index b3989270afc4..f97039bc0ad1 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -14,6 +14,7 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os import sys @@ -31,10 +32,10 @@ from UserList import UserList =20 from Common import EdkLogger as EdkLogger from Common import GlobalData as GlobalData -from DataType import * -from BuildToolError import * +from .DataType import * +from .BuildToolError import * from CommonDataClass.DataClass import * -from Parsing import GetSplitValueList +from .Parsing import GetSplitValueList from Common.LongFilePathSupport import OpenLongFilePath as open from Common.MultipleWorkspace import MultipleWorkspace as mws import uuid @@ -468,7 +469,7 @@ def SaveFileOnChange(File, Content, IsBinaryFile=3DTrue= ): try: if GlobalData.gIsWindows: try: - from PyUtility import SaveFileToDisk + from .PyUtility import SaveFileToDisk if not SaveFileToDisk(File, Content): EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData= =3DFile) except: diff --git a/BaseTools/Source/Python/Common/Parsing.py b/BaseTools/Source/P= ython/Common/Parsing.py index 717bc569d1c9..27460f9856ad 100644 --- a/BaseTools/Source/Python/Common/Parsing.py +++ b/BaseTools/Source/Python/Common/Parsing.py @@ -14,10 +14,11 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range -from StringUtils import * +from .StringUtils import * from CommonDataClass.DataClass import * -from DataType import * +from .DataType import * =20 ## ParseDefineMacro # diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Sour= ce/Python/Common/StringUtils.py index 2f45bc3674cc..b62e03f9d32f 100644 --- a/BaseTools/Source/Python/Common/StringUtils.py +++ b/BaseTools/Source/Python/Common/StringUtils.py @@ -14,15 +14,16 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range import re -import DataType +from . import DataType import Common.LongFilePathOs as os import string -import EdkLogger as EdkLogger +from . import EdkLogger as EdkLogger =20 -import GlobalData -from BuildToolError import * +from . import GlobalData +from .BuildToolError import * from CommonDataClass.Exceptions import * from Common.LongFilePathSupport import OpenLongFilePath as open from Common.MultipleWorkspace import MultipleWorkspace as mws diff --git a/BaseTools/Source/Python/Common/TargetTxtClassObject.py b/BaseT= ools/Source/Python/Common/TargetTxtClassObject.py index 8ba8dd31a8c5..55a2f564821e 100644 --- a/BaseTools/Source/Python/Common/TargetTxtClassObject.py +++ b/BaseTools/Source/Python/Common/TargetTxtClassObject.py @@ -15,11 +15,12 @@ # Import Modules # from __future__ import print_function +from __future__ import absolute_import import Common.LongFilePathOs as os -import EdkLogger -import DataType -from BuildToolError import * -import GlobalData +from . import EdkLogger +from . import DataType +from .BuildToolError import * +from . import GlobalData from Common.LongFilePathSupport import OpenLongFilePath as open =20 gDefaultTargetTxtFile =3D "target.txt" diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseToo= ls/Source/Python/Common/ToolDefClassObject.py index dec48b3f295b..32b39f2b6ca4 100644 --- a/BaseTools/Source/Python/Common/ToolDefClassObject.py +++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py @@ -14,20 +14,21 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os import re -import EdkLogger +from . import EdkLogger =20 -from BuildToolError import * -from TargetTxtClassObject import * +from .BuildToolError import * +from .TargetTxtClassObject import * from Common.LongFilePathSupport import OpenLongFilePath as open from Common.Misc import PathClass 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_TA= G,\ +from .DataType import TAB_TOD_DEFINES_TARGET, TAB_TOD_DEFINES_TOOL_CHAIN_T= AG,\ TAB_TOD_DEFINES_TARGET_ARCH, TAB_TOD_DEFINES_COMMAND_= TYPE\ , TAB_TOD_DEFINES_FAMILY, TAB_TOD_DEFINES_BUILDRULEFA= MILY =20 diff --git a/BaseTools/Source/Python/Ecc/CParser.py b/BaseTools/Source/Pyth= on/Ecc/CParser.py index 51a05902e225..432c947c934e 100644 --- a/BaseTools/Source/Python/Ecc/CParser.py +++ b/BaseTools/Source/Python/Ecc/CParser.py @@ -1,6 +1,7 @@ # $ANTLR 3.0.1 C.g 2010-02-23 09:58:53 =20 from __future__ import print_function +from __future__ import absolute_import from antlr3 import * from antlr3.compat import set, frozenset =20 @@ -23,8 +24,8 @@ from antlr3.compat import set, frozenset # ## =20 -import CodeFragment -import FileProfile +from . import CodeFragment +from . import FileProfile =20 =20 =20 diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python= /Ecc/Check.py index 4a60e9bab0e4..de34a68fc6c8 100644 --- a/BaseTools/Source/Python/Ecc/Check.py +++ b/BaseTools/Source/Python/Ecc/Check.py @@ -10,15 +10,16 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os import re from CommonDataClass.DataClass import * import Common.DataType as DT -from EccToolError import * -from MetaDataParser import ParseHeaderCommentSection -import EccGlobalData -import c +from .EccToolError import * +from .MetaDataParser import ParseHeaderCommentSection +from . import EccGlobalData +from . import c from Common.LongFilePathSupport import OpenLongFilePath as open from Common.MultipleWorkspace import MultipleWorkspace as mws =20 diff --git a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py b/BaseToo= ls/Source/Python/Ecc/CodeFragmentCollector.py index 2efae2c7c1de..dbd7891928aa 100644 --- a/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py +++ b/BaseTools/Source/Python/Ecc/CodeFragmentCollector.py @@ -17,18 +17,19 @@ # =20 from __future__ import print_function +from __future__ import absolute_import import re import Common.LongFilePathOs as os import sys =20 import antlr3 -from CLexer import CLexer -from CParser import CParser +from .CLexer import CLexer +from .CParser import CParser =20 -import FileProfile -from CodeFragment import Comment -from CodeFragment import PP_Directive -from ParserWarning import Warning +from . import FileProfile +from .CodeFragment import Comment +from .CodeFragment import PP_Directive +from .ParserWarning import Warning =20 =20 ##define T_CHAR_SPACE ' ' diff --git a/BaseTools/Source/Python/Ecc/Database.py b/BaseTools/Source/Pyt= hon/Ecc/Database.py index 204117512452..34f49f3cba8b 100644 --- a/BaseTools/Source/Python/Ecc/Database.py +++ b/BaseTools/Source/Python/Ecc/Database.py @@ -14,6 +14,7 @@ ## # Import Modules # +from __future__ import absolute_import import sqlite3 import Common.LongFilePathOs as os, time =20 @@ -26,9 +27,9 @@ from Table.TableFunction import TableFunction from Table.TablePcd import TablePcd from Table.TableIdentifier import TableIdentifier from Table.TableReport import TableReport -from MetaFileWorkspace.MetaFileTable import ModuleTable -from MetaFileWorkspace.MetaFileTable import PackageTable -from MetaFileWorkspace.MetaFileTable import PlatformTable +from .MetaFileWorkspace.MetaFileTable import ModuleTable +from .MetaFileWorkspace.MetaFileTable import PackageTable +from .MetaFileWorkspace.MetaFileTable import PlatformTable from Table.TableFdf import TableFdf =20 ## diff --git a/BaseTools/Source/Python/Ecc/Ecc.py b/BaseTools/Source/Python/E= cc/Ecc.py index e78d70372e36..8fe6c4eed40a 100644 --- a/BaseTools/Source/Python/Ecc/Ecc.py +++ b/BaseTools/Source/Python/Ecc/Ecc.py @@ -14,14 +14,15 @@ ## # Import Modules # +from __future__ import absolute_import import Common.LongFilePathOs as os, time, glob, sys import Common.EdkLogger as EdkLogger -import Database -import EccGlobalData -from MetaDataParser import * +from . import Database +from . import EccGlobalData +from .MetaDataParser import * from optparse import OptionParser -from Configuration import Configuration -from Check import Check +from .Configuration import Configuration +from .Check import Check import Common.GlobalData as GlobalData =20 from Common.StringUtils import NormPath @@ -29,14 +30,14 @@ from Common.BuildVersion import gBUILD_VERSION from Common import BuildToolError from Common.Misc import PathClass from Common.Misc import DirCache -from MetaFileWorkspace.MetaFileParser import DscParser -from MetaFileWorkspace.MetaFileParser import DecParser -from MetaFileWorkspace.MetaFileParser import InfParser -from MetaFileWorkspace.MetaFileParser import Fdf -from MetaFileWorkspace.MetaFileTable import MetaFileStorage -import c +from .MetaFileWorkspace.MetaFileParser import DscParser +from .MetaFileWorkspace.MetaFileParser import DecParser +from .MetaFileWorkspace.MetaFileParser import InfParser +from .MetaFileWorkspace.MetaFileParser import Fdf +from .MetaFileWorkspace.MetaFileTable import MetaFileStorage +from . import c import re, string -from Exception import * +from .Exception import * from Common.LongFilePathSupport import OpenLongFilePath as open from Common.MultipleWorkspace import MultipleWorkspace as mws =20 diff --git a/BaseTools/Source/Python/Ecc/Exception.py b/BaseTools/Source/Py= thon/Ecc/Exception.py index bde41c3a4b57..ba43ebe03fdb 100644 --- a/BaseTools/Source/Python/Ecc/Exception.py +++ b/BaseTools/Source/Python/Ecc/Exception.py @@ -15,7 +15,8 @@ # Import Modules # from __future__ import print_function -from Xml.XmlRoutines import * +from __future__ import absolute_import +from .Xml.XmlRoutines import * import Common.LongFilePathOs as os =20 # ExceptionXml to parse Exception Node of XML file diff --git a/BaseTools/Source/Python/Ecc/FileProfile.py b/BaseTools/Source/= Python/Ecc/FileProfile.py index f31d37ff9683..be0b6455ca41 100644 --- a/BaseTools/Source/Python/Ecc/FileProfile.py +++ b/BaseTools/Source/Python/Ecc/FileProfile.py @@ -16,9 +16,10 @@ # Import Modules # =20 +from __future__ import absolute_import import re import Common.LongFilePathOs as os -from ParserWarning import Warning +from .ParserWarning import Warning from Common.LongFilePathSupport import OpenLongFilePath as open =20 CommentList =3D [] @@ -55,4 +56,4 @@ class FileProfile : except IOError: raise Warning("Error when opening file %s" % FileName) =20 - =20 \ No newline at end of file + =20 diff --git a/BaseTools/Source/Python/Ecc/MetaDataParser.py b/BaseTools/Sour= ce/Python/Ecc/MetaDataParser.py index 9b8b96aa4b43..545a9c3b20b4 100644 --- a/BaseTools/Source/Python/Ecc/MetaDataParser.py +++ b/BaseTools/Source/Python/Ecc/MetaDataParser.py @@ -11,12 +11,13 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os from CommonDataClass.DataClass import * -from EccToolError import * +from .EccToolError import * from Common.MultipleWorkspace import MultipleWorkspace as mws -import EccGlobalData +from . import EccGlobalData import re ## Get the inlcude path list for a source file # diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.p= y b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py index 003a3f6559fa..2a2dabfd7701 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py @@ -14,6 +14,7 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os import re @@ -32,7 +33,7 @@ from Common.Misc import GuidStructureStringToGuidString, = CheckPcdDatum, PathClas from Common.Expression import * from CommonDataClass.Exceptions import * =20 -from MetaFileTable import MetaFileStorage +from .MetaFileTable import MetaFileStorage from GenFds.FdfParser import FdfParser from Common.LongFilePathSupport import OpenLongFilePath as open from Common.LongFilePathSupport import CodecOpenLongFilePath diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileTable.py= b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileTable.py index 9faa6b58b001..9a0f4769adaa 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileTable.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileTable.py @@ -14,13 +14,14 @@ ## # Import Modules # +from __future__ import absolute_import import uuid =20 import Common.EdkLogger as EdkLogger import EccGlobalData =20 -from MetaDataTable import Table -from MetaDataTable import ConvertToSqlString +from .MetaDataTable import Table +from .MetaDataTable import ConvertToSqlString from CommonDataClass.DataClass import MODEL_FILE_DSC, MODEL_FILE_DEC, MODE= L_FILE_INF, \ MODEL_FILE_OTHERS =20 diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc= /c.py index e2a5cc8487fa..9f7ed34d23d0 100644 --- a/BaseTools/Source/Python/Ecc/c.py +++ b/BaseTools/Source/Python/Ecc/c.py @@ -12,18 +12,19 @@ # =20 from __future__ import print_function +from __future__ import absolute_import import sys import Common.LongFilePathOs as os import re import string -import CodeFragmentCollector -import FileProfile +from . import CodeFragmentCollector +from . import FileProfile from CommonDataClass import DataClass -import Database +from . import Database from Common import EdkLogger -from EccToolError import * -import EccGlobalData -import MetaDataParser +from .EccToolError import * +from . import EccGlobalData +from . import MetaDataParser =20 IncludeFileListDict =3D {} AllIncludeFileListDict =3D {} diff --git a/BaseTools/Source/Python/Eot/CParser.py b/BaseTools/Source/Pyth= on/Eot/CParser.py index 51a05902e225..432c947c934e 100644 --- a/BaseTools/Source/Python/Eot/CParser.py +++ b/BaseTools/Source/Python/Eot/CParser.py @@ -1,6 +1,7 @@ # $ANTLR 3.0.1 C.g 2010-02-23 09:58:53 =20 from __future__ import print_function +from __future__ import absolute_import from antlr3 import * from antlr3.compat import set, frozenset =20 @@ -23,8 +24,8 @@ from antlr3.compat import set, frozenset # ## =20 -import CodeFragment -import FileProfile +from . import CodeFragment +from . import FileProfile =20 =20 =20 diff --git a/BaseTools/Source/Python/Eot/CodeFragmentCollector.py b/BaseToo= ls/Source/Python/Eot/CodeFragmentCollector.py index 1e30e2ce62e2..8a5e5df17e5a 100644 --- a/BaseTools/Source/Python/Eot/CodeFragmentCollector.py +++ b/BaseTools/Source/Python/Eot/CodeFragmentCollector.py @@ -16,17 +16,18 @@ # Import Modules # from __future__ import print_function +from __future__ import absolute_import import re import Common.LongFilePathOs as os import sys =20 import antlr3 -from CLexer import CLexer -from CParser import CParser +from .CLexer import CLexer +from .CParser import CParser =20 -import FileProfile -from CodeFragment import PP_Directive -from ParserWarning import Warning +from . import FileProfile +from .CodeFragment import PP_Directive +from .ParserWarning import Warning =20 =20 ##define T_CHAR_SPACE ' ' diff --git a/BaseTools/Source/Python/Eot/Eot.py b/BaseTools/Source/Python/E= ot/Eot.py index 1862d71f7342..f020c90c7cf9 100644 --- a/BaseTools/Source/Python/Eot/Eot.py +++ b/BaseTools/Source/Python/Eot/Eot.py @@ -14,21 +14,22 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os, time, glob import Common.EdkLogger as EdkLogger -import EotGlobalData +from . import EotGlobalData from optparse import OptionParser from Common.StringUtils import NormPath from Common import BuildToolError from Common.Misc import GuidStructureStringToGuidString, sdict -from InfParserLite import * -import c -import Database +from .InfParserLite import * +from . import c +from . import Database from array import array -from Report import Report +from .Report import Report from Common.BuildVersion import gBUILD_VERSION -from Parser import ConvertGuid +from .Parser import ConvertGuid from Common.LongFilePathSupport import OpenLongFilePath as open import struct import uuid @@ -154,7 +155,7 @@ class CompressedImage(Image): =20 def _GetSections(m): try: - import EfiCompressor + from . import EfiCompressor TmpData =3D EfiCompressor.FrameworkDecompress( m[m._HEADER_SIZE_:], len(m) - m._HEADER_SIZE_ @@ -162,7 +163,7 @@ class CompressedImage(Image): DecData =3D array('B') DecData.fromstring(TmpData) except: - import EfiCompressor + from . import EfiCompressor TmpData =3D EfiCompressor.UefiDecompress( m[m._HEADER_SIZE_:], len(m) - m._HEADER_SIZE_ @@ -749,7 +750,7 @@ class GuidDefinedImage(Image): SectionList.append(Sec) elif Guid =3D=3D m.TIANO_COMPRESS_GUID: try: - import EfiCompressor + from . import EfiCompressor # skip the header Offset =3D m.DataOffset - 4 TmpData =3D EfiCompressor.FrameworkDecompress(m[Offset:], = len(m)-Offset) @@ -770,7 +771,7 @@ class GuidDefinedImage(Image): pass elif Guid =3D=3D m.LZMA_COMPRESS_GUID: try: - import LzmaCompressor + from . import LzmaCompressor # skip the header Offset =3D m.DataOffset - 4 TmpData =3D LzmaCompressor.LzmaDecompress(m[Offset:], len(= m)-Offset) diff --git a/BaseTools/Source/Python/Eot/FileProfile.py b/BaseTools/Source/= Python/Eot/FileProfile.py index 0544c0d55b44..3846279cad4c 100644 --- a/BaseTools/Source/Python/Eot/FileProfile.py +++ b/BaseTools/Source/Python/Eot/FileProfile.py @@ -16,9 +16,10 @@ # Import Modules # =20 +from __future__ import absolute_import import re import Common.LongFilePathOs as os -from ParserWarning import Warning +from .ParserWarning import Warning from Common.LongFilePathSupport import OpenLongFilePath as open =20 # Profile contents of a file diff --git a/BaseTools/Source/Python/Eot/InfParserLite.py b/BaseTools/Sourc= e/Python/Eot/InfParserLite.py index 5a2eab9b0413..fb7b6e9755eb 100644 --- a/BaseTools/Source/Python/Eot/InfParserLite.py +++ b/BaseTools/Source/Python/Eot/InfParserLite.py @@ -15,6 +15,7 @@ # Import Modules # from __future__ import print_function +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os import Common.EdkLogger as EdkLogger @@ -22,8 +23,8 @@ from Common.DataType import * from CommonDataClass.DataClass import * from Common.Identification import * from Common.StringUtils import * -from Parser import * -import Database +from .Parser import * +from . import Database =20 ## EdkInfParser() class # diff --git a/BaseTools/Source/Python/Eot/Parser.py b/BaseTools/Source/Pytho= n/Eot/Parser.py index 0b720d5b2187..e01a9770befb 100644 --- a/BaseTools/Source/Python/Eot/Parser.py +++ b/BaseTools/Source/Python/Eot/Parser.py @@ -15,12 +15,13 @@ ## # Import Modules # +from __future__ import absolute_import import Common.LongFilePathOs as os, re import Common.EdkLogger as EdkLogger from Common.DataType import * from CommonDataClass.DataClass import * from Common.StringUtils import CleanString, GetSplitValueList, ReplaceMacro -import EotGlobalData +from . import EotGlobalData from Common.StringUtils import GetSplitList from Common.LongFilePathSupport import OpenLongFilePath as open =20 diff --git a/BaseTools/Source/Python/Eot/Report.py b/BaseTools/Source/Pytho= n/Eot/Report.py index 7435b4d7c930..afdb31f58411 100644 --- a/BaseTools/Source/Python/Eot/Report.py +++ b/BaseTools/Source/Python/Eot/Report.py @@ -14,8 +14,9 @@ ## # Import Modules # +from __future__ import absolute_import import Common.LongFilePathOs as os -import EotGlobalData +from . import EotGlobalData from Common.LongFilePathSupport import OpenLongFilePath as open =20 ## Report() class diff --git a/BaseTools/Source/Python/Eot/c.py b/BaseTools/Source/Python/Eot= /c.py index ceefc952237f..4f0b58a52c79 100644 --- a/BaseTools/Source/Python/Eot/c.py +++ b/BaseTools/Source/Python/Eot/c.py @@ -16,15 +16,16 @@ # Import Modules # from __future__ import print_function +from __future__ import absolute_import import sys import Common.LongFilePathOs as os import re -import CodeFragmentCollector -import FileProfile +from . import CodeFragmentCollector +from . import FileProfile from CommonDataClass import DataClass from Common import EdkLogger -from EotToolError import * -import EotGlobalData +from .EotToolError import * +from . import EotGlobalData =20 # Global Dicts IncludeFileListDict =3D {} diff --git a/BaseTools/Source/Python/GenFds/AprioriSection.py b/BaseTools/S= ource/Python/GenFds/AprioriSection.py index 5d1e56b7f1da..b0693eb4ea71 100644 --- a/BaseTools/Source/Python/GenFds/AprioriSection.py +++ b/BaseTools/Source/Python/GenFds/AprioriSection.py @@ -15,12 +15,13 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range from struct import * import Common.LongFilePathOs as os from io import BytesIO -import FfsFileStatement -from GenFdsGlobalVariable import GenFdsGlobalVariable +from . import FfsFileStatement +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import AprioriSectionClassObject from Common.StringUtils import * from Common.Misc import SaveFileOnChange, PathClass diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/P= ython/GenFds/Capsule.py index b02661d99855..41fd614b86c4 100644 --- a/BaseTools/Source/Python/GenFds/Capsule.py +++ b/BaseTools/Source/Python/GenFds/Capsule.py @@ -15,17 +15,16 @@ ## # Import Modules # -from GenFdsGlobalVariable import GenFdsGlobalVariable +from __future__ import absolute_import +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import CapsuleClassObject import Common.LongFilePathOs as os import subprocess from io import BytesIO from Common.Misc import SaveFileOnChange -from GenFds import GenFds from Common.Misc import PackRegistryFormatGuid import uuid from struct import pack -from GenFds import FindExtendTool from Common import EdkLogger from Common.BuildToolError import * =20 @@ -66,6 +65,7 @@ class Capsule (CapsuleClassObject) : # UINT32 CapsuleImageSize; # } EFI_CAPSULE_HEADER; # + from .GenFds import FindExtendTool Header =3D BytesIO() # # Use FMP capsule GUID: 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A @@ -201,6 +201,7 @@ class Capsule (CapsuleClassObject) : # @retval string Generated Capsule file path # def GenCapsule(self): + from .GenFds import GenFds if self.UiCapsuleName.upper() + 'cap' in GenFds.ImageBinDict: return GenFds.ImageBinDict[self.UiCapsuleName.upper() + 'cap'] =20 diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Sour= ce/Python/GenFds/CapsuleData.py index 83b2731110bc..d8d3415ce494 100644 --- a/BaseTools/Source/Python/GenFds/CapsuleData.py +++ b/BaseTools/Source/Python/GenFds/CapsuleData.py @@ -15,8 +15,9 @@ ## # Import Modules # -import Ffs -from GenFdsGlobalVariable import GenFdsGlobalVariable +from __future__ import absolute_import +from . import Ffs +from .GenFdsGlobalVariable import GenFdsGlobalVariable from io import BytesIO from struct import pack import os diff --git a/BaseTools/Source/Python/GenFds/CompressSection.py b/BaseTools/= Source/Python/GenFds/CompressSection.py index 4ae14f27b3e1..aaaabf84dca8 100644 --- a/BaseTools/Source/Python/GenFds/CompressSection.py +++ b/BaseTools/Source/Python/GenFds/CompressSection.py @@ -15,11 +15,12 @@ ## # Import Modules # -from Ffs import Ffs -import Section +from __future__ import absolute_import +from .Ffs import Ffs +from . import Section import subprocess import Common.LongFilePathOs as os -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import CompressSectionClassObject from Common.DataType import * =20 diff --git a/BaseTools/Source/Python/GenFds/DataSection.py b/BaseTools/Sour= ce/Python/GenFds/DataSection.py index 29caa00c0d8d..a6387b07c582 100644 --- a/BaseTools/Source/Python/GenFds/DataSection.py +++ b/BaseTools/Source/Python/GenFds/DataSection.py @@ -15,10 +15,11 @@ ## # Import Modules # -import Section -from GenFdsGlobalVariable import GenFdsGlobalVariable +from __future__ import absolute_import +from . import Section +from .GenFdsGlobalVariable import GenFdsGlobalVariable import subprocess -from Ffs import Ffs +from .Ffs import Ffs import Common.LongFilePathOs as os from CommonDataClass.FdfClass import DataSectionClassObject from Common.Misc import PeImageClass diff --git a/BaseTools/Source/Python/GenFds/DepexSection.py b/BaseTools/Sou= rce/Python/GenFds/DepexSection.py index f42162d5a27e..b2d123bfc045 100644 --- a/BaseTools/Source/Python/GenFds/DepexSection.py +++ b/BaseTools/Source/Python/GenFds/DepexSection.py @@ -15,10 +15,11 @@ ## # Import Modules # -import Section -from GenFdsGlobalVariable import GenFdsGlobalVariable +from __future__ import absolute_import +from . import Section +from .GenFdsGlobalVariable import GenFdsGlobalVariable import subprocess -from Ffs import Ffs +from .Ffs import Ffs import Common.LongFilePathOs as os from CommonDataClass.FdfClass import DepexSectionClassObject from AutoGen.GenDepex import DependencyExpression diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Sourc= e/Python/GenFds/EfiSection.py index 8ac37dd96b9b..d28019e5f85c 100644 --- a/BaseTools/Source/Python/GenFds/EfiSection.py +++ b/BaseTools/Source/Python/GenFds/EfiSection.py @@ -15,11 +15,12 @@ ## # Import Modules # +from __future__ import absolute_import from struct import * -import Section -from GenFdsGlobalVariable import GenFdsGlobalVariable +from . import Section +from .GenFdsGlobalVariable import GenFdsGlobalVariable import subprocess -from Ffs import Ffs +from .Ffs import Ffs import Common.LongFilePathOs as os from CommonDataClass.FdfClass import EfiSectionClassObject from Common import EdkLogger diff --git a/BaseTools/Source/Python/GenFds/Fd.py b/BaseTools/Source/Python= /GenFds/Fd.py index 3305a470edfa..9e7d0fbfc534 100644 --- a/BaseTools/Source/Python/GenFds/Fd.py +++ b/BaseTools/Source/Python/GenFds/Fd.py @@ -15,18 +15,18 @@ ## # Import Modules # -import Region -import Fv +from __future__ import absolute_import +from . import Region +from . import Fv import Common.LongFilePathOs as os from io import BytesIO import sys from struct import * -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import FDClassObject from Common import EdkLogger from Common.BuildToolError import * from Common.Misc import SaveFileOnChange -from GenFds import GenFds from Common.DataType import BINARY_FILE_TYPE_FV =20 ## generate FD @@ -47,6 +47,7 @@ class FD(FDClassObject): # @retval string Generated FD file name # def GenFd (self, Flag =3D False): + from .GenFds import GenFds if self.FdUiName.upper() + 'fd' in GenFds.ImageBinDict: return GenFds.ImageBinDict[self.FdUiName.upper() + 'fd'] =20 diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index 22f430894d47..b7c4bb35a4e2 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -17,35 +17,36 @@ # Import Modules # from __future__ import print_function +from __future__ import absolute_import import re =20 -import Fd -import Region -import Fv -import AprioriSection -import FfsInfStatement -import FfsFileStatement -import VerSection -import UiSection -import FvImageSection -import DataSection -import DepexSection -import CompressSection -import GuidSection -import Capsule -import CapsuleData -import Rule -import RuleComplexFile -import RuleSimpleFile -import EfiSection -import Vtf -import ComponentStatement -import OptionRom -import OptRomInfStatement -import OptRomFileStatement +from . import Fd +from . import Region +from . import Fv +from . import AprioriSection +from . import FfsInfStatement +from . import FfsFileStatement +from . import VerSection +from . import UiSection +from . import FvImageSection +from . import DataSection +from . import DepexSection +from . import CompressSection +from . import GuidSection +from . import Capsule +from . import CapsuleData +from . import Rule +from . import RuleComplexFile +from . import RuleSimpleFile +from . import EfiSection +from . import Vtf +from . import ComponentStatement +from . import OptionRom +from . import OptRomInfStatement +from . import OptRomFileStatement import string =20 -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable from Common.BuildToolError import * from Common import EdkLogger from Common.Misc import PathClass @@ -60,8 +61,8 @@ from Common.Misc import tdict from Common.MultipleWorkspace import MultipleWorkspace as mws import Common.LongFilePathOs as os from Common.LongFilePathSupport import OpenLongFilePath as open -from Capsule import EFI_CERT_TYPE_PKCS7_GUID -from Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID +from .Capsule import EFI_CERT_TYPE_PKCS7_GUID +from .Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID from Common.RangeExpression import RangeExpression =20 ##define T_CHAR_SPACE ' ' diff --git a/BaseTools/Source/Python/GenFds/FfsFileStatement.py b/BaseTools= /Source/Python/GenFds/FfsFileStatement.py index 74c4b3d8adb6..1c655433ed83 100644 --- a/BaseTools/Source/Python/GenFds/FfsFileStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsFileStatement.py @@ -15,20 +15,21 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range -import Ffs -import Rule +from . import Ffs +from . import Rule import Common.LongFilePathOs as os from io import BytesIO import subprocess =20 -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import FileStatementClassObject from Common import EdkLogger from Common.BuildToolError import * from Common.Misc import GuidStructureByteArrayToGuidString -from GuidSection import GuidSection -from FvImageSection import FvImageSection +from .GuidSection import GuidSection +from .FvImageSection import FvImageSection from Common.Misc import SaveFileOnChange from struct import * =20 diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/= Source/Python/GenFds/FfsInfStatement.py index ef34dbf00754..63acd50601bc 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -16,17 +16,18 @@ ## # Import Modules # -import Rule +from __future__ import absolute_import +from . import Rule import Common.LongFilePathOs as os from io import BytesIO from struct import * -from GenFdsGlobalVariable import GenFdsGlobalVariable -import Ffs +from .GenFdsGlobalVariable import GenFdsGlobalVariable +from . import Ffs import subprocess import sys -import Section -import RuleSimpleFile -import RuleComplexFile +from . import Section +from . import RuleSimpleFile +from . import RuleComplexFile from CommonDataClass.FdfClass import FfsInfStatementClassObject from Common.MultipleWorkspace import MultipleWorkspace as mws from Common.StringUtils import * @@ -36,15 +37,15 @@ from Common.Misc import ProcessDuplicatedInf from Common.Misc import GetVariableOffset from Common import EdkLogger from Common.BuildToolError import * -from GuidSection import GuidSection -from FvImageSection import FvImageSection +from .GuidSection import GuidSection +from .FvImageSection import FvImageSection from Common.Misc import PeImageClass from AutoGen.GenDepex import DependencyExpression from PatchPcdValue.PatchPcdValue import PatchBinaryFile from Common.LongFilePathSupport import CopyLongFilePath from Common.LongFilePathSupport import OpenLongFilePath as open import Common.GlobalData as GlobalData -from DepexSection import DepexSection +from .DepexSection import DepexSection from Common.Misc import SaveFileOnChange from Common.Expression import * from Common.DataType import * diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python= /GenFds/Fv.py index 31ae60396556..947aaad09903 100644 --- a/BaseTools/Source/Python/GenFds/Fv.py +++ b/BaseTools/Source/Python/GenFds/Fv.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import ## @file # process FV generation # @@ -21,11 +22,10 @@ import subprocess from io import BytesIO from struct import * =20 -import Ffs -import AprioriSection -import FfsFileStatement -from GenFdsGlobalVariable import GenFdsGlobalVariable -from GenFds import GenFds +from . import Ffs +from . import AprioriSection +from . import FfsFileStatement +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import FvClassObject from Common.Misc import SaveFileOnChange, PackGUID from Common.LongFilePathSupport import CopyLongFilePath @@ -71,6 +71,7 @@ class FV (FvClassObject): # def AddToBuffer (self, Buffer, BaseAddress=3DNone, BlockSize=3D None, = BlockNum=3DNone, ErasePloarity=3D'1', VtfDict=3DNone, MacroDict =3D {}, Fla= g=3DFalse) : =20 + from .GenFds import GenFds if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFds.= ImageBinDict: return GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] =20 diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/S= ource/Python/GenFds/FvImageSection.py index b4f1f3340e99..04556fc87099 100644 --- a/BaseTools/Source/Python/GenFds/FvImageSection.py +++ b/BaseTools/Source/Python/GenFds/FvImageSection.py @@ -15,11 +15,12 @@ ## # Import Modules # -import Section +from __future__ import absolute_import +from . import Section from io import BytesIO -from Ffs import Ffs +from .Ffs import Ffs import subprocess -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable import Common.LongFilePathOs as os from CommonDataClass.FdfClass import FvImageSectionClassObject from Common import EdkLogger diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Py= thon/GenFds/GenFds.py index 04fc17906a57..3931c7051be4 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -16,18 +16,19 @@ # Import Modules # from __future__ import print_function +from __future__ import absolute_import from builtins import range from optparse import OptionParser import sys import Common.LongFilePathOs as os import linecache -import FdfParser +from . import FdfParser import Common.BuildToolError as BuildToolError -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable from Workspace.WorkspaceDatabase import WorkspaceDatabase from Workspace.BuildClassObject import PcdClassObject -import RuleComplexFile -from EfiSection import EfiSection +from . import RuleComplexFile +from .EfiSection import EfiSection from io import BytesIO import Common.TargetTxtClassObject as TargetTxtClassObject import Common.ToolDefClassObject as ToolDefClassObject @@ -41,7 +42,7 @@ from Common.Misc import ClearDuplicatedInf from Common.Misc import GuidStructureStringToGuidString from Common.BuildVersion import gBUILD_VERSION from Common.MultipleWorkspace import MultipleWorkspace as mws -import FfsFileStatement +from . import FfsFileStatement import glob from struct import unpack =20 diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Sour= ce/Python/GenFds/GuidSection.py index bda185476b95..9c7ee3b3a6a9 100644 --- a/BaseTools/Source/Python/GenFds/GuidSection.py +++ b/BaseTools/Source/Python/GenFds/GuidSection.py @@ -16,19 +16,19 @@ ## # Import Modules # -import Section +from __future__ import absolute_import +from . import Section import subprocess -from Ffs import Ffs +from .Ffs import Ffs import Common.LongFilePathOs as os -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import GuidSectionClassObject from Common import ToolDefClassObject import sys from Common import EdkLogger from Common.BuildToolError import * -from FvImageSection import FvImageSection +from .FvImageSection import FvImageSection from Common.LongFilePathSupport import OpenLongFilePath as open -from GenFds import FindExtendTool from Common.DataType import * =20 ## generate GUIDed section @@ -131,6 +131,7 @@ class GuidSection(GuidSectionClassObject) : ExternalTool =3D None ExternalOption =3D None if self.NameGuid is not None: + from .GenFds import FindExtendTool ExternalTool, ExternalOption =3D FindExtendTool(self.KeyString= List, self.CurrentArchList, self.NameGuid) =20 # diff --git a/BaseTools/Source/Python/GenFds/OptRomFileStatement.py b/BaseTo= ols/Source/Python/GenFds/OptRomFileStatement.py index 4ef9b4d0e9a8..089d77494ffe 100644 --- a/BaseTools/Source/Python/GenFds/OptRomFileStatement.py +++ b/BaseTools/Source/Python/GenFds/OptRomFileStatement.py @@ -15,9 +15,10 @@ ## # Import Modules # +from __future__ import absolute_import import Common.LongFilePathOs as os =20 -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable ##=20 # # diff --git a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py b/BaseToo= ls/Source/Python/GenFds/OptRomInfStatement.py index 79891b3b82a4..b377b6a7ba33 100644 --- a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py +++ b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py @@ -15,16 +15,16 @@ ## # Import Modules # -import RuleSimpleFile -import RuleComplexFile -import Section -import OptionRom +from __future__ import absolute_import +from . import RuleSimpleFile +from . import RuleComplexFile +from . import Section import Common.GlobalData as GlobalData =20 from Common.DataType import * from Common.StringUtils import * -from FfsInfStatement import FfsInfStatement -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .FfsInfStatement import FfsInfStatement +from .GenFdsGlobalVariable import GenFdsGlobalVariable =20 ##=20 # @@ -46,6 +46,7 @@ class OptRomInfStatement (FfsInfStatement): # def __GetOptRomParams(self): =20 + from . import OptionRom if self.OverrideAttribs is None: self.OverrideAttribs =3D OptionRom.OverrideAttribs() =20 @@ -151,4 +152,4 @@ class OptRomInfStatement (FfsInfStatement): =20 return OutputFileList =20 - =20 \ No newline at end of file + =20 diff --git a/BaseTools/Source/Python/GenFds/OptionRom.py b/BaseTools/Source= /Python/GenFds/OptionRom.py index 755eb01da7e1..901b5c4f3318 100644 --- a/BaseTools/Source/Python/GenFds/OptionRom.py +++ b/BaseTools/Source/Python/GenFds/OptionRom.py @@ -15,12 +15,12 @@ ## # Import Modules # +from __future__ import absolute_import import Common.LongFilePathOs as os import subprocess =20 -import OptRomInfStatement -from GenFdsGlobalVariable import GenFdsGlobalVariable -from GenFds import GenFds +from . import OptRomInfStatement +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import OptionRomClassObject from Common.Misc import SaveFileOnChange from Common import EdkLogger diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Py= thon/GenFds/Region.py index 1b127345bcfb..c2dc31058de6 100644 --- a/BaseTools/Source/Python/GenFds/Region.py +++ b/BaseTools/Source/Python/GenFds/Region.py @@ -15,9 +15,10 @@ ## # Import Modules # +from __future__ import absolute_import from builtins import range from struct import * -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable from io import BytesIO import string from CommonDataClass.FdfClass import RegionClassObject diff --git a/BaseTools/Source/Python/GenFds/RuleComplexFile.py b/BaseTools/= Source/Python/GenFds/RuleComplexFile.py index 36c483fbb207..c357fedbd3be 100644 --- a/BaseTools/Source/Python/GenFds/RuleComplexFile.py +++ b/BaseTools/Source/Python/GenFds/RuleComplexFile.py @@ -15,7 +15,8 @@ ## # Import Modules # -import Rule +from __future__ import absolute_import +from . import Rule from CommonDataClass.FdfClass import RuleComplexFileClassObject =20 ## complex rule diff --git a/BaseTools/Source/Python/GenFds/RuleSimpleFile.py b/BaseTools/S= ource/Python/GenFds/RuleSimpleFile.py index 061f984e6af4..7aa184e7d8bb 100644 --- a/BaseTools/Source/Python/GenFds/RuleSimpleFile.py +++ b/BaseTools/Source/Python/GenFds/RuleSimpleFile.py @@ -15,7 +15,8 @@ ## # Import Modules # -import Rule +from __future__ import absolute_import +from . import Rule from CommonDataClass.FdfClass import RuleSimpleFileClassObject =20 ## simple rule diff --git a/BaseTools/Source/Python/GenFds/Section.py b/BaseTools/Source/P= ython/GenFds/Section.py index 5895998158b6..891a3734f7cc 100644 --- a/BaseTools/Source/Python/GenFds/Section.py +++ b/BaseTools/Source/Python/GenFds/Section.py @@ -15,8 +15,9 @@ ## # Import Modules # +from __future__ import absolute_import from CommonDataClass.FdfClass import SectionClassObject -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable import Common.LongFilePathOs as os, glob from Common import EdkLogger from Common.BuildToolError import * diff --git a/BaseTools/Source/Python/GenFds/UiSection.py b/BaseTools/Source= /Python/GenFds/UiSection.py index 280500952b63..24f2f3ca938d 100644 --- a/BaseTools/Source/Python/GenFds/UiSection.py +++ b/BaseTools/Source/Python/GenFds/UiSection.py @@ -15,11 +15,12 @@ ## # Import Modules # -import Section -from Ffs import Ffs +from __future__ import absolute_import +from . import Section +from .Ffs import Ffs import subprocess import Common.LongFilePathOs as os -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import UiSectionClassObject from Common.LongFilePathSupport import OpenLongFilePath as open from Common.DataType import * diff --git a/BaseTools/Source/Python/GenFds/VerSection.py b/BaseTools/Sourc= e/Python/GenFds/VerSection.py index 456a430079bb..db71fe9653d4 100644 --- a/BaseTools/Source/Python/GenFds/VerSection.py +++ b/BaseTools/Source/Python/GenFds/VerSection.py @@ -15,11 +15,12 @@ ## # Import Modules # -from Ffs import Ffs -import Section +from __future__ import absolute_import +from .Ffs import Ffs +from . import Section import Common.LongFilePathOs as os import subprocess -from GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import GenFdsGlobalVariable from CommonDataClass.FdfClass import VerSectionClassObject from Common.LongFilePathSupport import OpenLongFilePath as open from Common.DataType import SUP_MODULE_SEC diff --git a/BaseTools/Source/Python/GenFds/Vtf.py b/BaseTools/Source/Pytho= n/GenFds/Vtf.py index 18ea37b9afdd..de0a8125abc1 100644 --- a/BaseTools/Source/Python/GenFds/Vtf.py +++ b/BaseTools/Source/Python/GenFds/Vtf.py @@ -15,7 +15,8 @@ ## # Import Modules # -from GenFdsGlobalVariable import GenFdsGlobalVariable +from __future__ import absolute_import +from .GenFdsGlobalVariable import GenFdsGlobalVariable import Common.LongFilePathOs as os from CommonDataClass.FdfClass import VtfClassObject from Common.LongFilePathSupport import OpenLongFilePath as open diff --git a/BaseTools/Source/Python/Table/TableDataModel.py b/BaseTools/So= urce/Python/Table/TableDataModel.py index 2c37592fc67c..6e29365e377e 100644 --- a/BaseTools/Source/Python/Table/TableDataModel.py +++ b/BaseTools/Source/Python/Table/TableDataModel.py @@ -14,9 +14,10 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger import CommonDataClass.DataClass as DataClass -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString =20 ## TableDataModel diff --git a/BaseTools/Source/Python/Table/TableDec.py b/BaseTools/Source/P= ython/Table/TableDec.py index 97139c58d893..93e766a49f7b 100644 --- a/BaseTools/Source/Python/Table/TableDec.py +++ b/BaseTools/Source/Python/Table/TableDec.py @@ -14,9 +14,10 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger import CommonDataClass.DataClass as DataClass -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString =20 ## TableDec diff --git a/BaseTools/Source/Python/Table/TableDsc.py b/BaseTools/Source/P= ython/Table/TableDsc.py index 4ac54933aa3b..51aec0625581 100644 --- a/BaseTools/Source/Python/Table/TableDsc.py +++ b/BaseTools/Source/Python/Table/TableDsc.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import ## @file # This file is used to create/update/query/erase table for dsc datas # @@ -16,7 +17,7 @@ # import Common.EdkLogger as EdkLogger import CommonDataClass.DataClass as DataClass -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString =20 ## TableDsc diff --git a/BaseTools/Source/Python/Table/TableEotReport.py b/BaseTools/So= urce/Python/Table/TableEotReport.py index bccf25ca45d5..3e21b957205c 100644 --- a/BaseTools/Source/Python/Table/TableEotReport.py +++ b/BaseTools/Source/Python/Table/TableEotReport.py @@ -14,9 +14,10 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger import Common.LongFilePathOs as os, time -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString2 import Eot.EotToolError as EotToolError import Eot.EotGlobalData as EotGlobalData @@ -73,4 +74,4 @@ class TableEotReport(Table): SqlCommand =3D """select max(ID) from %s""" % self.Table self.Cur.execute(SqlCommand) for Item in self.Cur: - return Item[0] \ No newline at end of file + return Item[0] diff --git a/BaseTools/Source/Python/Table/TableFdf.py b/BaseTools/Source/P= ython/Table/TableFdf.py index eea8e9404d55..6869c3d06820 100644 --- a/BaseTools/Source/Python/Table/TableFdf.py +++ b/BaseTools/Source/Python/Table/TableFdf.py @@ -14,9 +14,10 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger import CommonDataClass.DataClass as DataClass -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString =20 ## TableFdf diff --git a/BaseTools/Source/Python/Table/TableFile.py b/BaseTools/Source/= Python/Table/TableFile.py index ac762ea7fcc0..cc8120e4de9b 100644 --- a/BaseTools/Source/Python/Table/TableFile.py +++ b/BaseTools/Source/Python/Table/TableFile.py @@ -14,8 +14,9 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString import Common.LongFilePathOs as os from CommonDataClass.DataClass import FileClass diff --git a/BaseTools/Source/Python/Table/TableFunction.py b/BaseTools/Sou= rce/Python/Table/TableFunction.py index 3d40bd61f695..9d482ccc7e4b 100644 --- a/BaseTools/Source/Python/Table/TableFunction.py +++ b/BaseTools/Source/Python/Table/TableFunction.py @@ -14,8 +14,9 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString =20 ## TableFunction diff --git a/BaseTools/Source/Python/Table/TableIdentifier.py b/BaseTools/S= ource/Python/Table/TableIdentifier.py index 0ec8b3c162ce..fa9d4406bb6e 100644 --- a/BaseTools/Source/Python/Table/TableIdentifier.py +++ b/BaseTools/Source/Python/Table/TableIdentifier.py @@ -14,9 +14,10 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger from Common.StringUtils import ConvertToSqlString -from Table import Table +from .Table import Table =20 ## TableIdentifier # @@ -87,4 +88,4 @@ class TableIdentifier(Table): % (self.Table, self.ID, Modifie= r, Type, Name, Value, Model, BelongsToFile, BelongsToFunction, StartLine, S= tartColumn, EndLine, EndColumn) Table.Insert(self, SqlCommand) =20 - return self.ID \ No newline at end of file + return self.ID diff --git a/BaseTools/Source/Python/Table/TableInf.py b/BaseTools/Source/P= ython/Table/TableInf.py index 478b77776e35..94f05c918525 100644 --- a/BaseTools/Source/Python/Table/TableInf.py +++ b/BaseTools/Source/Python/Table/TableInf.py @@ -14,9 +14,10 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger import CommonDataClass.DataClass as DataClass -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString =20 ## TableInf diff --git a/BaseTools/Source/Python/Table/TablePcd.py b/BaseTools/Source/P= ython/Table/TablePcd.py index ca1c0f0c8ab2..adac47d12383 100644 --- a/BaseTools/Source/Python/Table/TablePcd.py +++ b/BaseTools/Source/Python/Table/TablePcd.py @@ -14,8 +14,9 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString =20 ## TablePcd @@ -87,4 +88,4 @@ class TablePcd(Table): % (self.Table, self.ID, CName, = TokenSpaceGuidCName, Token, DatumType, Model, BelongsToFile, BelongsToFunct= ion, StartLine, StartColumn, EndLine, EndColumn) Table.Insert(self, SqlCommand) =20 - return self.ID \ No newline at end of file + return self.ID diff --git a/BaseTools/Source/Python/Table/TableQuery.py b/BaseTools/Source= /Python/Table/TableQuery.py index f377b10561dc..a991e610dafd 100644 --- a/BaseTools/Source/Python/Table/TableQuery.py +++ b/BaseTools/Source/Python/Table/TableQuery.py @@ -14,9 +14,10 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger from Common.StringUtils import ConvertToSqlString -from Table import Table +from .Table import Table =20 ## TableQuery # diff --git a/BaseTools/Source/Python/Table/TableReport.py b/BaseTools/Sourc= e/Python/Table/TableReport.py index 9ce1d0aa2518..b46d082a470a 100644 --- a/BaseTools/Source/Python/Table/TableReport.py +++ b/BaseTools/Source/Python/Table/TableReport.py @@ -14,9 +14,10 @@ ## # Import Modules # +from __future__ import absolute_import import Common.EdkLogger as EdkLogger import Common.LongFilePathOs as os, time -from Table import Table +from .Table import Table from Common.StringUtils import ConvertToSqlString2 import EccToolError as EccToolError import EccGlobalData as EccGlobalData diff --git a/BaseTools/Source/Python/UPT/Library/Parsing.py b/BaseTools/Sou= rce/Python/UPT/Library/Parsing.py index 22faabfa4bb0..10bd603be9cb 100644 --- a/BaseTools/Source/Python/UPT/Library/Parsing.py +++ b/BaseTools/Source/Python/UPT/Library/Parsing.py @@ -16,6 +16,7 @@ ''' Parsing ''' +from __future__ import absolute_import =20 ## # Import Modules @@ -43,7 +44,7 @@ from Logger import StringTable as ST import Logger.Log as Logger =20 from Parser.DecParser import Dec -import GlobalData +from . import GlobalData =20 gPKG_INFO_DICT =3D {} =20 diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 09002526b8b0..145ebb56e9ce 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -18,6 +18,7 @@ # into PlatformBuildClassObject form for easier use for AutoGen. # from __future__ import print_function +from __future__ import absolute_import from builtins import range from Common.StringUtils import * from Common.DataType import * @@ -27,11 +28,11 @@ from Common.Expression import * from CommonDataClass.CommonClass import SkuInfoClass from Common.TargetTxtClassObject import * from Common.ToolDefClassObject import * -from MetaDataTable import * -from MetaFileTable import * -from MetaFileParser import * +from .MetaDataTable import * +from .MetaFileTable import * +from .MetaFileParser import * =20 -from WorkspaceCommon import GetDeclaredPcd +from .WorkspaceCommon import GetDeclaredPcd from Common.Misc import AnalyzeDscPcd from Common.Misc import ProcessDuplicatedInf import re diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/= Source/Python/Workspace/InfBuildData.py index 658f86ac891c..b2aa1f755b77 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -12,12 +12,13 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from __future__ import absolute_import from builtins import range from Common.StringUtils import * from Common.DataType import * from Common.Misc import * from types import * -from MetaFileParser import * +from .MetaFileParser import * from collections import OrderedDict =20 from Workspace.BuildClassObject import ModuleBuildClassObject, LibraryClas= sObject, PcdClassObject diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index b05d381bdf1a..79624da12ebb 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -16,6 +16,7 @@ # Import Modules # from __future__ import print_function +from __future__ import absolute_import from builtins import range import Common.LongFilePathOs as os import re @@ -34,8 +35,8 @@ from Common.Expression import * from CommonDataClass.Exceptions import * from Common.LongFilePathSupport import OpenLongFilePath as open from collections import defaultdict -from MetaFileTable import MetaFileStorage -from MetaFileCommentParser import CheckInfComment +from .MetaFileTable import MetaFileStorage +from .MetaFileCommentParser import CheckInfComment =20 ## RegEx for finding file versions hexVersionPattern =3D re.compile(r'0[xX][\da-f-A-F]{5,8}') diff --git a/BaseTools/Source/Python/Workspace/MetaFileTable.py b/BaseTools= /Source/Python/Workspace/MetaFileTable.py index 69b2c40e7f1a..c68d1e0a01cb 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileTable.py +++ b/BaseTools/Source/Python/Workspace/MetaFileTable.py @@ -14,13 +14,14 @@ ## # Import Modules # +from __future__ import absolute_import import uuid =20 import Common.EdkLogger as EdkLogger from Common.BuildToolError import FORMAT_INVALID =20 -from MetaDataTable import Table, TableFile -from MetaDataTable import ConvertToSqlString +from .MetaDataTable import Table, TableFile +from .MetaDataTable import ConvertToSqlString from CommonDataClass.DataClass import MODEL_FILE_DSC, MODEL_FILE_DEC, MODE= L_FILE_INF, \ MODEL_FILE_OTHERS from Common.DataType import * diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseToo= ls/Source/Python/Workspace/WorkspaceCommon.py index e8f159b26204..d987bbf441ea 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -11,9 +11,10 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. # =20 +from __future__ import absolute_import from collections import OrderedDict, defaultdict from Common.DataType import SUP_MODULE_USER_DEFINED -from BuildClassObject import LibraryClassObject +from .BuildClassObject import LibraryClassObject import Common.GlobalData as GlobalData from Workspace.BuildClassObject import StructurePcd from Common.BuildToolError import RESOURCE_NOT_AVAILABLE diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseT= ools/Source/Python/Workspace/WorkspaceDatabase.py index 9e055fcfc46b..0ee8cdedd8b3 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py @@ -15,15 +15,16 @@ ## # Import Modules # +from __future__ import absolute_import import sqlite3 from Common.StringUtils import * from Common.DataType import * from Common.Misc import * from types import * =20 -from MetaDataTable import * -from MetaFileTable import * -from MetaFileParser import * +from .MetaDataTable import * +from .MetaFileTable import * +from .MetaFileParser import * =20 from Workspace.DecBuildData import DecBuildData from Workspace.DscBuildData import DscBuildData diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index 08e81016de8b..e612ff77eab1 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -17,6 +17,7 @@ # Import Modules # from __future__ import print_function +from __future__ import absolute_import import Common.LongFilePathOs as os import re from io import BytesIO @@ -46,7 +47,7 @@ from Common.BuildToolError import * from Workspace.WorkspaceDatabase import * from Common.MultipleWorkspace import MultipleWorkspace as mws =20 -from BuildReport import BuildReport +from .BuildReport import BuildReport from GenPatchPcdTable.GenPatchPcdTable import * from PatchPcdValue.PatchPcdValue import * =20 --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556342634591.3014273002046; Wed, 20 Jun 2018 21:45:42 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1DC91211D56C8; Wed, 20 Jun 2018 21:44:55 -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 9F927211D505C for ; Wed, 20 Jun 2018 21:44:53 -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:50 +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:44 +0800 Message-Id: <20180621044346.28495-19-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 18/20] BaseTools: Move OverrideAttribs to OptRomInfStatement.py 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" Move "class OverrideAttribs" to OptRomInfStatement.py to remove "import OptionRom" which may form a circular import: GenFds.OptionRom =3D> GenFds.OptRomInfStatement =3D> GenFds.OptionRom Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Source/Python/GenFds/FdfParser.py | 2 +- BaseTools/Source/Python/GenFds/OptRomInfStatement.py | 17 ++++++++++++++--- BaseTools/Source/Python/GenFds/OptionRom.py | 14 -------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index b7c4bb35a4e2..349f17bea5e0 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -4428,7 +4428,7 @@ class FdfParser: # def __GetOptRomOverrides(self, Obj): if self.__IsToken('{'): - Overrides =3D OptionRom.OverrideAttribs() + Overrides =3D OptRomInfStatement.OverrideAttribs() while True: if self.__IsKeyword( "PCI_VENDOR_ID"): if not self.__IsToken( "=3D"): diff --git a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py b/BaseToo= ls/Source/Python/GenFds/OptRomInfStatement.py index b377b6a7ba33..e1d607669fbf 100644 --- a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py +++ b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py @@ -46,9 +46,8 @@ class OptRomInfStatement (FfsInfStatement): # def __GetOptRomParams(self): =20 - from . import OptionRom if self.OverrideAttribs is None: - self.OverrideAttribs =3D OptionRom.OverrideAttribs() + self.OverrideAttribs =3D OverrideAttribs() =20 if self.OverrideAttribs.NeedCompress is None: self.OverrideAttribs.NeedCompress =3D self.OptRomDefs.get ('PC= I_COMPRESS') @@ -152,4 +151,16 @@ class OptRomInfStatement (FfsInfStatement): =20 return OutputFileList =20 - =20 +class OverrideAttribs: + + ## The constructor + # + # @param self The object pointer + # + def __init__(self): + + self.PciVendorId =3D None + self.PciClassCode =3D None + self.PciDeviceId =3D None + self.PciRevision =3D None + self.NeedCompress =3D None diff --git a/BaseTools/Source/Python/GenFds/OptionRom.py b/BaseTools/Source= /Python/GenFds/OptionRom.py index 901b5c4f3318..e82c94884ab2 100644 --- a/BaseTools/Source/Python/GenFds/OptionRom.py +++ b/BaseTools/Source/Python/GenFds/OptionRom.py @@ -123,17 +123,3 @@ class OPTIONROM (OptionRomClassObject): GenFdsGlobalVariable.SharpCounter =3D 0 =20 return OutputFile - -class OverrideAttribs: - =20 - ## The constructor - # - # @param self The object pointer - # - def __init__(self): - =20 - self.PciVendorId =3D None - self.PciClassCode =3D None - self.PciDeviceId =3D None - self.PciRevision =3D None - self.NeedCompress =3D None --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 1529556347203785.8366800622339; Wed, 20 Jun 2018 21:45:47 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 46ED2211D56CB; Wed, 20 Jun 2018 21:44:57 -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 9F8CD211D56CB for ; Wed, 20 Jun 2018 21:44:55 -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:52 +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:45 +0800 Message-Id: <20180621044346.28495-20-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 19/20] BaseTools: Move FindExtendTool to GenFdsGlobalVariable.py 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" Importing "FindExtendTool" from GenFds.GenFds could create the following circular imports: * GenFds.FdfParser =3D> GenFds.Capsule =3D> GenFds.GenFds =3D> GenFds.FdfPa= rser * GenFds.FdfParser =3D> GenFds.Fd =3D> GenFds.Fv =3D> GenFds.AprioriSection= =3D> GenFds.FfsFileStatement =3D> GenFds.GuidSection =3D> GenFds.GenFds =3D> GenFds.FdfParser This commit moves "FindExtendTool" to GenFdsGlobalVariable.py to break the circles. Besides, FindExtendTool is tweaked slightly with the following changes: ToolDefClassObject.ToolDefDict =3D> ToolDefDict TAB_GUID =3D> DataType.TAB_GUID TAB_TOD_DEFINES_TARGET =3D> DataType.TAB_TOD_DEFINES_TARGET TAB_TOD_DEFINES_TOOL_CHAIN_TAG =3D> DataType.TAB_TOD_DEFINES_TOOL_CHAIN_TAG TAB_TOD_DEFINES_TARGET_ARCH =3D> DataType.TAB_TOD_DEFINES_TARGET_ARCH Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Source/Python/GenFds/Capsule.py | 1 + BaseTools/Source/Python/GenFds/GenFds.py | 92 --------------= ----- BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 94 ++++++++++++++= +++++- BaseTools/Source/Python/GenFds/GuidSection.py | 2 +- 4 files changed, 95 insertions(+), 94 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/P= ython/GenFds/Capsule.py index 41fd614b86c4..ddb11ac3093e 100644 --- a/BaseTools/Source/Python/GenFds/Capsule.py +++ b/BaseTools/Source/Python/GenFds/Capsule.py @@ -17,6 +17,7 @@ # from __future__ import absolute_import from .GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import FindExtendTool from CommonDataClass.FdfClass import CapsuleClassObject import Common.LongFilePathOs as os import subprocess diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Py= thon/GenFds/GenFds.py index 3931c7051be4..4a8559adbaec 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -369,98 +369,6 @@ def SingleCheckCallback(option, opt_str, value, parser= ): else: parser.error("Option %s only allows one instance in command line!"= % option) =20 -## FindExtendTool() -# -# Find location of tools to process data -# -# @param KeyStringList Filter for inputs of section generation -# @param CurrentArchList Arch list -# @param NameGuid The Guid name -# -def FindExtendTool(KeyStringList, CurrentArchList, NameGuid): - ToolDb =3D ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.ConfDir= ).ToolsDefTxtDatabase - # if user not specify filter, try to deduce it from global data. - if KeyStringList is None or KeyStringList =3D=3D []: - Target =3D GenFdsGlobalVariable.TargetName - ToolChain =3D GenFdsGlobalVariable.ToolChainTag - if ToolChain not in ToolDb['TOOL_CHAIN_TAG']: - EdkLogger.error("GenFds", GENFDS_ERROR, "Can not find external= tool because tool tag %s is not defined in tools_def.txt!" % ToolChain) - KeyStringList =3D [Target + '_' + ToolChain + '_' + CurrentArchLis= t[0]] - for Arch in CurrentArchList: - if Target + '_' + ToolChain + '_' + Arch not in KeyStringList: - KeyStringList.append(Target + '_' + ToolChain + '_' + Arch) - - if GenFdsGlobalVariable.GuidToolDefinition: - if NameGuid in GenFdsGlobalVariable.GuidToolDefinition: - return GenFdsGlobalVariable.GuidToolDefinition[NameGuid] - - ToolDefinition =3D ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable= .ConfDir).ToolsDefTxtDictionary - ToolPathTmp =3D None - ToolOption =3D None - ToolPathKey =3D None - ToolOptionKey =3D None - KeyList =3D None - for ToolDef in ToolDefinition.items(): - if NameGuid.lower() =3D=3D ToolDef[1].lower() : - KeyList =3D ToolDef[0].split('_') - Key =3D KeyList[0] + \ - '_' + \ - KeyList[1] + \ - '_' + \ - KeyList[2] - if Key in KeyStringList and KeyList[4] =3D=3D TAB_GUID: - ToolPathKey =3D Key + '_' + KeyList[3] + '_PATH' - ToolOptionKey =3D Key + '_' + KeyList[3] + '_FLAGS' - ToolPath =3D ToolDefinition.get(ToolPathKey) - ToolOption =3D ToolDefinition.get(ToolOptionKey) - if ToolPathTmp is None: - ToolPathTmp =3D ToolPath - else: - if ToolPathTmp !=3D ToolPath: - EdkLogger.error("GenFds", GENFDS_ERROR, "Don't kno= w which tool to use, %s or %s ?" % (ToolPathTmp, ToolPath)) - - BuildOption =3D {} - for Arch in CurrentArchList: - Platform =3D GenFdsGlobalVariable.WorkSpace.BuildObject[GenFdsGlob= alVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlo= balVariable.ToolChainTag] - # key is (ToolChainFamily, ToolChain, CodeBase) - for item in Platform.BuildOptions: - if '_PATH' in item[1] or '_FLAGS' in item[1] or '_GUID' in ite= m[1]: - if not item[0] or (item[0] and GenFdsGlobalVariable.ToolCh= ainFamily=3D=3D item[0]): - if item[1] not in BuildOption: - BuildOption[item[1]] =3D Platform.BuildOptions[ite= m] - if BuildOption: - ToolList =3D [TAB_TOD_DEFINES_TARGET, TAB_TOD_DEFINES_TOOL_CHA= IN_TAG, TAB_TOD_DEFINES_TARGET_ARCH] - for Index in range(2, -1, -1): - for Key in list(BuildOption.keys()): - List =3D Key.split('_') - if List[Index] =3D=3D '*': - for String in ToolDb[ToolList[Index]]: - if String in [Arch, GenFdsGlobalVariable.Targe= tName, GenFdsGlobalVariable.ToolChainTag]: - List[Index] =3D String - NewKey =3D '%s_%s_%s_%s_%s' % tuple(List) - if NewKey not in BuildOption: - BuildOption[NewKey] =3D BuildOption[Ke= y] - continue - del BuildOption[Key] - elif List[Index] not in ToolDb[ToolList[Index]]: - del BuildOption[Key] - if BuildOption: - if not KeyList: - for Op in BuildOption: - if NameGuid =3D=3D BuildOption[Op]: - KeyList =3D Op.split('_') - Key =3D KeyList[0] + '_' + KeyList[1] +'_' + KeyList[2] - if Key in KeyStringList and KeyList[4] =3D=3D TAB_GUID: - ToolPathKey =3D Key + '_' + KeyList[3] + '_PATH' - ToolOptionKey =3D Key + '_' + KeyList[3] + '_FLAGS' - if ToolPathKey in BuildOption: - ToolPathTmp =3D BuildOption[ToolPathKey] - if ToolOptionKey in BuildOption: - ToolOption =3D BuildOption[ToolOptionKey] - - GenFdsGlobalVariable.GuidToolDefinition[NameGuid] =3D (ToolPathTmp, To= olOption) - return ToolPathTmp, ToolOption - ## Parse command line options # # Using standard Python module optparse to parse command line option of th= is tool. diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseT= ools/Source/Python/GenFds/GenFdsGlobalVariable.py index 19a5f5afbc89..9f20c402527f 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -28,7 +28,7 @@ from Common import EdkLogger from Common.Misc import SaveFileOnChange =20 from Common.TargetTxtClassObject import TargetTxtClassObject -from Common.ToolDefClassObject import ToolDefClassObject +from Common.ToolDefClassObject import ToolDefClassObject, ToolDefDict from AutoGen.BuildEngine import BuildRule import Common.DataType as DataType from Common.Misc import PathClass @@ -844,3 +844,95 @@ class GenFdsGlobalVariable: DebugLogger =3D staticmethod(DebugLogger) MacroExtend =3D staticmethod (MacroExtend) GetPcdValue =3D staticmethod(GetPcdValue) + +## FindExtendTool() +# +# Find location of tools to process data +# +# @param KeyStringList Filter for inputs of section generation +# @param CurrentArchList Arch list +# @param NameGuid The Guid name +# +def FindExtendTool(KeyStringList, CurrentArchList, NameGuid): + ToolDb =3D ToolDefDict(GenFdsGlobalVariable.ConfDir).ToolsDefTxtDataba= se + # if user not specify filter, try to deduce it from global data. + if KeyStringList is None or KeyStringList =3D=3D []: + Target =3D GenFdsGlobalVariable.TargetName + ToolChain =3D GenFdsGlobalVariable.ToolChainTag + if ToolChain not in ToolDb['TOOL_CHAIN_TAG']: + EdkLogger.error("GenFds", GENFDS_ERROR, "Can not find external= tool because tool tag %s is not defined in tools_def.txt!" % ToolChain) + KeyStringList =3D [Target + '_' + ToolChain + '_' + CurrentArchLis= t[0]] + for Arch in CurrentArchList: + if Target + '_' + ToolChain + '_' + Arch not in KeyStringList: + KeyStringList.append(Target + '_' + ToolChain + '_' + Arch) + + if GenFdsGlobalVariable.GuidToolDefinition: + if NameGuid in GenFdsGlobalVariable.GuidToolDefinition: + return GenFdsGlobalVariable.GuidToolDefinition[NameGuid] + + ToolDefinition =3D ToolDefDict(GenFdsGlobalVariable.ConfDir).ToolsDefT= xtDictionary + ToolPathTmp =3D None + ToolOption =3D None + ToolPathKey =3D None + ToolOptionKey =3D None + KeyList =3D None + for ToolDef in ToolDefinition.items(): + if NameGuid.lower() =3D=3D ToolDef[1].lower() : + KeyList =3D ToolDef[0].split('_') + Key =3D KeyList[0] + \ + '_' + \ + KeyList[1] + \ + '_' + \ + KeyList[2] + if Key in KeyStringList and KeyList[4] =3D=3D DataType.TAB_GUI= D: + ToolPathKey =3D Key + '_' + KeyList[3] + '_PATH' + ToolOptionKey =3D Key + '_' + KeyList[3] + '_FLAGS' + ToolPath =3D ToolDefinition.get(ToolPathKey) + ToolOption =3D ToolDefinition.get(ToolOptionKey) + if ToolPathTmp is None: + ToolPathTmp =3D ToolPath + else: + if ToolPathTmp !=3D ToolPath: + EdkLogger.error("GenFds", GENFDS_ERROR, "Don't kno= w which tool to use, %s or %s ?" % (ToolPathTmp, ToolPath)) + + BuildOption =3D {} + for Arch in CurrentArchList: + Platform =3D GenFdsGlobalVariable.WorkSpace.BuildObject[GenFdsGlob= alVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlo= balVariable.ToolChainTag] + # key is (ToolChainFamily, ToolChain, CodeBase) + for item in Platform.BuildOptions: + if '_PATH' in item[1] or '_FLAGS' in item[1] or '_GUID' in ite= m[1]: + if not item[0] or (item[0] and GenFdsGlobalVariable.ToolCh= ainFamily=3D=3D item[0]): + if item[1] not in BuildOption: + BuildOption[item[1]] =3D Platform.BuildOptions[ite= m] + if BuildOption: + ToolList =3D [DataType.TAB_TOD_DEFINES_TARGET, DataType.TAB_TO= D_DEFINES_TOOL_CHAIN_TAG, DataType.TAB_TOD_DEFINES_TARGET_ARCH] + for Index in range(2, -1, -1): + for Key in list(BuildOption.keys()): + List =3D Key.split('_') + if List[Index] =3D=3D '*': + for String in ToolDb[ToolList[Index]]: + if String in [Arch, GenFdsGlobalVariable.Targe= tName, GenFdsGlobalVariable.ToolChainTag]: + List[Index] =3D String + NewKey =3D '%s_%s_%s_%s_%s' % tuple(List) + if NewKey not in BuildOption: + BuildOption[NewKey] =3D BuildOption[Ke= y] + continue + del BuildOption[Key] + elif List[Index] not in ToolDb[ToolList[Index]]: + del BuildOption[Key] + if BuildOption: + if not KeyList: + for Op in BuildOption: + if NameGuid =3D=3D BuildOption[Op]: + KeyList =3D Op.split('_') + Key =3D KeyList[0] + '_' + KeyList[1] +'_' + KeyList[2] + if Key in KeyStringList and KeyList[4] =3D=3D DataType= .TAB_GUID: + ToolPathKey =3D Key + '_' + KeyList[3] + '_PATH' + ToolOptionKey =3D Key + '_' + KeyList[3] + '_FLAGS' + if ToolPathKey in BuildOption: + ToolPathTmp =3D BuildOption[ToolPathKey] + if ToolOptionKey in BuildOption: + ToolOption =3D BuildOption[ToolOptionKey] + + GenFdsGlobalVariable.GuidToolDefinition[NameGuid] =3D (ToolPathTmp, To= olOption) + return ToolPathTmp, ToolOption diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Sour= ce/Python/GenFds/GuidSection.py index 9c7ee3b3a6a9..4fa8c56afa92 100644 --- a/BaseTools/Source/Python/GenFds/GuidSection.py +++ b/BaseTools/Source/Python/GenFds/GuidSection.py @@ -22,6 +22,7 @@ import subprocess from .Ffs import Ffs import Common.LongFilePathOs as os from .GenFdsGlobalVariable import GenFdsGlobalVariable +from .GenFdsGlobalVariable import FindExtendTool from CommonDataClass.FdfClass import GuidSectionClassObject from Common import ToolDefClassObject import sys @@ -131,7 +132,6 @@ class GuidSection(GuidSectionClassObject) : ExternalTool =3D None ExternalOption =3D None if self.NameGuid is not None: - from .GenFds import FindExtendTool ExternalTool, ExternalOption =3D FindExtendTool(self.KeyString= List, self.CurrentArchList, self.NameGuid) =20 # --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 23:15:57 2024 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 152955635153228.028817475803862; Wed, 20 Jun 2018 21:45:51 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 83314211D56D5; Wed, 20 Jun 2018 21:44:59 -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 9E7B7211D56D1 for ; Wed, 20 Jun 2018 21:44:57 -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:54 +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:46 +0800 Message-Id: <20180621044346.28495-21-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 20/20] BaseTools: Move ImageBinDict to GenFdsGlobalVariable.py 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" Move "ImageBinDict" from GenFds.py to GenFdsGlobalVariable.py so that we can remove the requirement to import GenFds.GenFds in Capsule.py, Fd.py and Fv.py. This breaks the following circular imports: * GenFds.FdfParser =3D> GenFds.Capsule =3D> GenFds.GenFds =3D> GenFds.FdfPa= rser * GenFds.FdfParser =3D> GenFds.Fd =3D> GenFds.GenFds =3D> GenFds.FdfParser * GenFds.FdfParser =3D> GenFds.Fd =3D> GenFds.Fv =3D> GenFds.GenFds =3D> GenFds.FdfParser Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/Source/Python/GenFds/Capsule.py | 6 +++--- BaseTools/Source/Python/GenFds/Fd.py | 14 +++++++------- BaseTools/Source/Python/GenFds/Fv.py | 10 +++++----- BaseTools/Source/Python/GenFds/GenFds.py | 2 -- BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 3 +++ 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/P= ython/GenFds/Capsule.py index ddb11ac3093e..787ae710660a 100644 --- a/BaseTools/Source/Python/GenFds/Capsule.py +++ b/BaseTools/Source/Python/GenFds/Capsule.py @@ -203,8 +203,8 @@ class Capsule (CapsuleClassObject) : # def GenCapsule(self): from .GenFds import GenFds - if self.UiCapsuleName.upper() + 'cap' in GenFds.ImageBinDict: - return GenFds.ImageBinDict[self.UiCapsuleName.upper() + 'cap'] + if self.UiCapsuleName.upper() + 'cap' in GenFdsGlobalVariable.Imag= eBinDict: + return GenFdsGlobalVariable.ImageBinDict[self.UiCapsuleName.up= per() + 'cap'] =20 GenFdsGlobalVariable.InfLogger( "\nGenerate %s Capsule" %self.UiCa= psuleName) if ('CAPSULE_GUID' in self.TokensDict and=20 @@ -238,7 +238,7 @@ class Capsule (CapsuleClassObject) : =20 GenFdsGlobalVariable.VerboseLogger( "\nGenerate %s Capsule Success= fully" %self.UiCapsuleName) GenFdsGlobalVariable.SharpCounter =3D 0 - GenFds.ImageBinDict[self.UiCapsuleName.upper() + 'cap'] =3D CapOut= putFile + GenFdsGlobalVariable.ImageBinDict[self.UiCapsuleName.upper() + 'ca= p'] =3D CapOutputFile return CapOutputFile =20 ## Generate inf file for capsule diff --git a/BaseTools/Source/Python/GenFds/Fd.py b/BaseTools/Source/Python= /GenFds/Fd.py index 9e7d0fbfc534..e4cb90a57df3 100644 --- a/BaseTools/Source/Python/GenFds/Fd.py +++ b/BaseTools/Source/Python/GenFds/Fd.py @@ -48,8 +48,8 @@ class FD(FDClassObject): # def GenFd (self, Flag =3D False): from .GenFds import GenFds - if self.FdUiName.upper() + 'fd' in GenFds.ImageBinDict: - return GenFds.ImageBinDict[self.FdUiName.upper() + 'fd'] + if self.FdUiName.upper() + 'fd' in GenFdsGlobalVariable.ImageBinDi= ct: + return GenFdsGlobalVariable.ImageBinDict[self.FdUiName.upper()= + 'fd'] =20 # # Print Information @@ -94,7 +94,7 @@ class FD(FDClassObject): PadRegion.Offset =3D PreviousRegionStart + PreviousReg= ionSize PadRegion.Size =3D RegionObj.Offset - PadRegion.Offset if not Flag: - PadRegion.AddToBuffer(TempFdBuffer, self.BaseAddre= ss, self.BlockSizeList, self.ErasePolarity, GenFds.ImageBinDict, self.vtfRa= wDict, self.DefineVarDict) + PadRegion.AddToBuffer(TempFdBuffer, self.BaseAddre= ss, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDi= ct, self.vtfRawDict, self.DefineVarDict) PreviousRegionStart =3D RegionObj.Offset PreviousRegionSize =3D RegionObj.Size # @@ -103,7 +103,7 @@ class FD(FDClassObject): if PreviousRegionSize > self.Size: pass GenFdsGlobalVariable.VerboseLogger('Call each region\'s Ad= dToBuffer function') - RegionObj.AddToBuffer (TempFdBuffer, self.BaseAddress, sel= f.BlockSizeList, self.ErasePolarity, GenFds.ImageBinDict, self.vtfRawDict, = self.DefineVarDict) + RegionObj.AddToBuffer (TempFdBuffer, self.BaseAddress, sel= f.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, sel= f.vtfRawDict, self.DefineVarDict) =20 FdBuffer =3D BytesIO('') PreviousRegionStart =3D -1 @@ -124,7 +124,7 @@ class FD(FDClassObject): PadRegion.Offset =3D PreviousRegionStart + PreviousRegionS= ize PadRegion.Size =3D RegionObj.Offset - PadRegion.Offset if not Flag: - PadRegion.AddToBuffer(FdBuffer, self.BaseAddress, self= .BlockSizeList, self.ErasePolarity, GenFds.ImageBinDict, self.vtfRawDict, s= elf.DefineVarDict) + PadRegion.AddToBuffer(FdBuffer, self.BaseAddress, self= .BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self= .vtfRawDict, self.DefineVarDict) PreviousRegionStart =3D RegionObj.Offset PreviousRegionSize =3D RegionObj.Size # @@ -138,7 +138,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, GenFdsGlobalVariable.ImageBinDict, self.vtfRaw= Dict, self.DefineVarDict, Flag=3DFlag) # # Write the buffer contents to Fd file # @@ -146,7 +146,7 @@ class FD(FDClassObject): if not Flag: SaveFileOnChange(FdFileName, FdBuffer.getvalue()) FdBuffer.close() - GenFds.ImageBinDict[self.FdUiName.upper() + 'fd'] =3D FdFileName + GenFdsGlobalVariable.ImageBinDict[self.FdUiName.upper() + 'fd'] = =3D FdFileName return FdFileName =20 ## generate VTF diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python= /GenFds/Fv.py index 947aaad09903..b48c0cfcc782 100644 --- a/BaseTools/Source/Python/GenFds/Fv.py +++ b/BaseTools/Source/Python/GenFds/Fv.py @@ -72,8 +72,8 @@ class FV (FvClassObject): def AddToBuffer (self, Buffer, BaseAddress=3DNone, BlockSize=3D None, = BlockNum=3DNone, ErasePloarity=3D'1', VtfDict=3DNone, MacroDict =3D {}, Fla= g=3DFalse) : =20 from .GenFds import GenFds - if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFds.= ImageBinDict: - return GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] + if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFdsG= lobalVariable.ImageBinDict: + return GenFdsGlobalVariable.ImageBinDict[self.UiFvName.upper()= + 'fv'] =20 # # Check whether FV in Capsule is in FD flash region. @@ -86,7 +86,7 @@ class FV (FvClassObject): for RegionData in RegionObj.RegionDataList: if RegionData.endswith(".fv"): continue - elif RegionData.upper() + 'fv' in GenFds.Image= BinDict: + elif RegionData.upper() + 'fv' in GenFdsGlobal= Variable.ImageBinDict: continue elif self.UiFvName.upper() =3D=3D RegionData.u= pper(): GenFdsGlobalVariable.ErrorLogger("Capsule = %s in FD region can't contain a FV %s in FD region." % (self.CapsuleName, s= elf.UiFvName.upper())) @@ -141,7 +141,7 @@ class FV (FvClassObject): FvOutputFile =3D self.CreateFileName =20 if Flag: - GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] =3D FvOutput= File + GenFdsGlobalVariable.ImageBinDict[self.UiFvName.upper() + 'fv'= ] =3D FvOutputFile return FvOutputFile =20 FvInfoFileName =3D os.path.join(GenFdsGlobalVariable.FfsDir, self.= UiFvName + '.inf') @@ -221,7 +221,7 @@ class FV (FvClassObject): # FvAlignmentValue is less than 1K self.FvAlignment =3D str (FvAlignmentValue) FvFileObj.close() - GenFds.ImageBinDict[self.UiFvName.upper() + 'fv'] =3D FvOu= tputFile + GenFdsGlobalVariable.ImageBinDict[self.UiFvName.upper() + = 'fv'] =3D FvOutputFile GenFdsGlobalVariable.LargeFileInFvFlags.pop() else: GenFdsGlobalVariable.ErrorLogger("Failed to generate %s FV= file." %self.UiFvName) diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Py= thon/GenFds/GenFds.py index 4a8559adbaec..5986b6d4a613 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -416,8 +416,6 @@ def myOptionParser(): # class GenFds : FdfParsef =3D None - # FvName, FdName, CapName in FDF, Image file name - ImageBinDict =3D {} OnlyGenerateThisFd =3D None OnlyGenerateThisFv =3D None OnlyGenerateThisCap =3D None diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseT= ools/Source/Python/GenFds/GenFdsGlobalVariable.py index 9f20c402527f..e3d5c93b6855 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -92,6 +92,9 @@ class GenFdsGlobalVariable: =20 SectionHeader =3D struct.Struct("3B 1B") =20 + # FvName, FdName, CapName in FDF, Image file name + ImageBinDict =3D {} + ## LoadBuildRule # @staticmethod --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel