From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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 3EE6C2238B597 for ; Thu, 18 Jan 2018 20:38:18 -0800 (PST) Received: from localhost.localdomain (unknown.telstraglobal.net [134.159.103.118]) by smtp.nue.novell.com with ESMTP (NOT encrypted); Fri, 19 Jan 2018 05:43:36 +0100 From: Gary Lin To: edk2-devel@lists.01.org Cc: Yonghong Zhu , Liming Gao Date: Fri, 19 Jan 2018 12:43:02 +0800 Message-Id: <20180119044316.4713-2-glin@suse.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180119044316.4713-1-glin@suse.com> References: <20180119044316.4713-1-glin@suse.com> Subject: [PATCH 01/15] BaseTools: Refactor python except statements X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jan 2018 04:38:19 -0000 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/UpdateBuildVersions.py | 12 +- BaseTools/Source/Python/AutoGen/AutoGen.py | 10 +- 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 | 16 +-- BaseTools/Source/Python/Common/FdfParserLite.py | 6 +- 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/Eot/FvImage.py | 2 +- 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 | 8 +- BaseTools/Source/Python/Workspace/InfBuildData.py | 2 +- BaseTools/Source/Python/Workspace/MetaFileParser.py | 16 +-- BaseTools/Source/Python/Workspace/MetaFileTable.py | 4 +- BaseTools/Source/Python/build/BuildReport.py | 2 +- BaseTools/Source/Python/build/build.py | 10 +- BaseTools/Tests/CheckPythonSyntax.py | 2 +- BaseTools/gcc/mingw-gcc-build.py | 2 +- 45 files changed, 253 insertions(+), 249 deletions(-) diff --git a/BaseTools/Scripts/UpdateBuildVersions.py b/BaseTools/Scripts/UpdateBuildVersions.py index e62030aa9f0f..cff2e2263a8a 100755 --- a/BaseTools/Scripts/UpdateBuildVersions.py +++ b/BaseTools/Scripts/UpdateBuildVersions.py @@ -90,7 +90,8 @@ def ShellCommandResults(CmdLine, Opt): sys.stderr.flush() returnValue = err_val.returncode - except IOError as (errno, strerror): + except IOError as err_arg: + (errno, strerror) = err_arg.args file_list.close() if not Opt.silent: sys.stderr.write("I/O ERROR : %s : %s\n" % (str(errno), strerror)) @@ -100,7 +101,8 @@ def ShellCommandResults(CmdLine, Opt): sys.stderr.flush() returnValue = errno - except OSError as (errno, strerror): + except OSError as err_arg: + (errno, strerror) = err_arg.args file_list.close() if not Opt.silent: sys.stderr.write("OS ERROR : %s : %s\n" % (str(errno), strerror)) @@ -210,13 +212,15 @@ def RevertCmd(Filename, Opt): sys.stderr.write("Subprocess ERROR : %s\n" % err_val) sys.stderr.flush() - except IOError as (errno, strerror): + except IOError as err_arg: + (errno, strerror) = err_arg.args if not Opt.silent: sys.stderr.write("I/O ERROR : %d : %s\n" % (str(errno), strerror)) sys.stderr.write("ERROR : this command failed : %s\n" % CmdLine) sys.stderr.flush() - except OSError as (errno, strerror): + except OSError as err_arg: + (errno, strerror) = err_arg.args if not Opt.silent: sys.stderr.write("OS ERROR : %d : %s\n" % (str(errno), strerror)) sys.stderr.write("ERROR : this command failed : %s\n" % CmdLine) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 0f7454f55a7a..faec5506a0e6 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -431,7 +431,7 @@ class WorkspaceAutoGen(AutoGen): if pcdvalue.startswith('H'): try: pcdvalue = ValueExpressionEx(pcdvalue[1:], PcdDatumType, self._GuidDict)(True) - except BadExpression, Value: + except BadExpression as Value: if Value.result > 1: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' % (TokenSpaceGuidCName, TokenCName, pcdvalue, Value)) @@ -448,7 +448,7 @@ class WorkspaceAutoGen(AutoGen): if pcdvalue.startswith('H'): try: pcdvalue = ValueExpressionEx(pcdvalue[1:], PcdDatumType, self._GuidDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' % (TokenSpaceGuidCName, TokenCName, pcdvalue, Value)) pcdvalue = 'H' + pcdvalue @@ -2469,9 +2469,9 @@ class PlatformAutoGen(AutoGen): if PcdValue: try: ToPcd.DefaultValue = ValueExpression(PcdValue)(True) - except WrnExpression, Value: + except WrnExpression as Value: ToPcd.DefaultValue = Value.result - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(ToPcd.TokenSpaceGuidCName, ToPcd.TokenCName, ToPcd.DefaultValue, Value), File=self.MetaFile) if ToPcd.DefaultValue: @@ -2481,7 +2481,7 @@ class PlatformAutoGen(AutoGen): _GuidDict.update(Guids) try: ToPcd.DefaultValue = ValueExpressionEx(ToPcd.DefaultValue, ToPcd.DatumType, _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.DefaultValue, Value), File=self.MetaFile) diff --git a/BaseTools/Source/Python/AutoGen/GenDepex.py b/BaseTools/Source/Python/AutoGen/GenDepex.py index 7aa22bd944a0..98a43db7a4e5 100644 --- a/BaseTools/Source/Python/AutoGen/GenDepex.py +++ b/BaseTools/Source/Python/AutoGen/GenDepex.py @@ -448,7 +448,7 @@ def Main(): os.utime(Option.OutputFile, None) else: Dpx.Generate() - except BaseException, X: + except BaseException as X: EdkLogger.quiet("") if Option != None and Option.debug != None: EdkLogger.quiet(traceback.format_exc()) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py index 7d3374a49373..3f98a34d81ec 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -1027,7 +1027,7 @@ cleanlib: else: try: Fd = open(F.Path, 'r') - except BaseException, X: + except BaseException as X: EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X)) FileContent = Fd.read() diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py index 856d19cda270..2711fc104f52 100644 --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py @@ -242,7 +242,7 @@ class UniFileClassObject(object): if len(Lang) != 3: try: FileIn = self.OpenUniFile(LongFilePath(File.Path)) - except UnicodeError, X: + except UnicodeError as X: EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File); except: EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File); @@ -393,7 +393,7 @@ class UniFileClassObject(object): try: FileIn = self.OpenUniFile(LongFilePath(File.Path)) - except UnicodeError, X: + except UnicodeError as X: EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File.Path); except: EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File.Path); diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py index 55fa06d414ea..216694325f96 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -231,7 +231,7 @@ class ValueExpression(object): } try: Val = eval(EvalStr, {}, Dict) - except Exception, Excpt: + except Exception as Excpt: raise BadExpression(str(Excpt)) if Operator in ['and', 'or']: @@ -351,7 +351,7 @@ class ValueExpression(object): continue try: Val = self.Eval(Op, Val, EvalFunc()) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept = Warn Val = Warn.result return Val @@ -390,7 +390,7 @@ class ValueExpression(object): Op += ' ' + self._Token try: Val = self.Eval(Op, Val, self._RelExpr()) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept = Warn Val = Warn.result return Val @@ -416,14 +416,14 @@ class ValueExpression(object): Val = self._UnaryExpr() try: return self.Eval('not', Val) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept = Warn return Warn.result if self._IsOperator(["~"]): Val = self._UnaryExpr() try: return self.Eval('~', Val) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept = Warn return Warn.result return self._IdenExpr() @@ -734,7 +734,7 @@ class ValueExpressionEx(ValueExpression): PcdValue = self.PcdValue try: PcdValue = ValueExpression.__call__(self, RealValue, Depth) - except WrnExpression, Value: + except WrnExpression as Value: PcdValue = Value.result if PcdValue == 'True': @@ -885,8 +885,8 @@ if __name__ == '__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/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py index 7d129bfcab59..ac03c3fef5bb 100644 --- a/BaseTools/Source/Python/Common/FdfParserLite.py +++ b/BaseTools/Source/Python/Common/FdfParserLite.py @@ -1190,7 +1190,7 @@ class FdfParser(object): # pass - except Warning, X: + except Warning as X: self.__UndoToken() FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber) X.message += '\nGot Token: \"%s\" from File %s\n' % (self.__Token, FileLineTuple[0]) + \ @@ -3659,7 +3659,7 @@ if __name__ == "__main__": import sys try: test_file = sys.argv[1] - except IndexError, v: + except IndexError as v: print "Usage: %s filename" % sys.argv[0] sys.exit(1) @@ -3667,7 +3667,7 @@ if __name__ == "__main__": try: parser.ParseFile() parser.CycleReferenceCheck() - except Warning, X: + except Warning as X: print X.message else: print "Success!" diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index a8ed718aa5d8..f1eb4c5a7892 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -522,7 +522,7 @@ def SaveFileOnChange(File, Content, IsBinaryFile=True): Fd = open(File, "wb") Fd.write(Content) Fd.close() - except IOError, X: + except IOError as X: EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X) return True @@ -556,7 +556,7 @@ def DataRestore(File): try: Fd = open(File, 'rb') Data = cPickle.load(Fd) - except Exception, e: + except Exception as e: EdkLogger.verbose("Failed to load [%s]\n\t%s" % (File, str(e))) Data = None finally: @@ -1494,7 +1494,7 @@ def ParseDevPathValue (Value): try: p = subprocess.Popen(Cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) out, err = p.communicate() - except Exception, X: + except Exception as X: raise BadExpression("DevicePath: %s" % (str(X)) ) finally: subprocess._cleanup() @@ -1549,7 +1549,7 @@ def ParseFieldValue (Value): Value = Value[1:-1] try: Value = "'" + uuid.UUID(Value).get_bytes_le() + "'" - except ValueError, Message: + except ValueError as Message: raise BadExpression('%s' % Message) Value, Size = ParseFieldValue(Value) return Value, 16 diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py index b6c929fd885b..10b6ac55242b 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -441,7 +441,7 @@ class RangeExpression(object): Op = self._Token try: Val = self.Eval(Op, Val, EvalFunc()) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept = Warn Val = Warn.result return Val @@ -464,7 +464,7 @@ class RangeExpression(object): Op += ' ' + self._Token try: Val = self.Eval(Op, Val, self._RelExpr()) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept = Warn Val = Warn.result return Val @@ -476,7 +476,7 @@ class RangeExpression(object): Val = self._NeExpr() try: return self.Eval(Token, Val) - except WrnExpression, Warn: + except WrnExpression as Warn: self._WarnExcept = Warn return Warn.result return self._IdenExpr() diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py index 716155e96d29..14ccabe833db 100644 --- a/BaseTools/Source/Python/Common/VpdInfoFile.py +++ b/BaseTools/Source/Python/Common/VpdInfoFile.py @@ -246,7 +246,7 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName): stdout=subprocess.PIPE, stderr= subprocess.PIPE, shell=True) - except Exception, X: + except Exception as X: EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, ExtraData="%s" % (str(X))) (out, error) = PopenObject.communicate() print out diff --git a/BaseTools/Source/Python/Ecc/CParser.py b/BaseTools/Source/Python/Ecc/CParser.py index baa521f43cc4..39883aca07c4 100644 --- a/BaseTools/Source/Python/Ecc/CParser.py +++ b/BaseTools/Source/Python/Ecc/CParser.py @@ -180,7 +180,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -539,7 +539,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -816,7 +816,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -971,7 +971,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1099,7 +1099,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1169,7 +1169,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1223,7 +1223,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1270,7 +1270,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1439,7 +1439,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1472,7 +1472,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1596,7 +1596,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1643,7 +1643,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1706,7 +1706,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1749,7 +1749,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1868,7 +1868,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1928,7 +1928,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2010,7 +2010,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2165,7 +2165,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2230,7 +2230,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2282,7 +2282,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2329,7 +2329,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2471,7 +2471,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3063,7 +3063,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3213,7 +3213,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3469,7 +3469,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3535,7 +3535,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3624,7 +3624,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3832,7 +3832,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3888,7 +3888,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3978,7 +3978,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4226,7 +4226,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4577,7 +4577,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4697,7 +4697,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4777,7 +4777,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4842,7 +4842,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4940,7 +4940,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5019,7 +5019,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5110,7 +5110,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5210,7 +5210,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5362,7 +5362,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5590,7 +5590,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5651,7 +5651,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5698,7 +5698,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5796,7 +5796,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6002,7 +6002,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6072,7 +6072,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6107,7 +6107,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8142,7 +8142,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8177,7 +8177,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8224,7 +8224,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8292,7 +8292,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8362,7 +8362,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8422,7 +8422,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8482,7 +8482,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8542,7 +8542,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8602,7 +8602,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8676,7 +8676,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8750,7 +8750,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8824,7 +8824,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9065,7 +9065,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9162,7 +9162,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9235,7 +9235,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9308,7 +9308,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -12474,7 +12474,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -12567,7 +12567,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -14537,7 +14537,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16258,7 +16258,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16329,7 +16329,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16442,7 +16442,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16593,7 +16593,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16710,7 +16710,7 @@ class CParser(Parser): - 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 a27e98c9752f..a4057ceb1775 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 = """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] ## Get count diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py index ba478f9ecf10..2fef87c4180a 100644 --- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py @@ -1183,7 +1183,7 @@ class DscParser(MetaFileParser): try: Processer[self._ItemType]() - except EvaluationException, Excpt: + except EvaluationException as Excpt: # # 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 expression: %s" % str(Excpt), # File=self._FileWithError, ExtraData=' '.join(self._ValueList), # Line=self._LineIndex+1) - except MacroException, Excpt: + except MacroException as Excpt: EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt), File=self._FileWithError, ExtraData=' '.join(self._ValueList), Line=self._LineIndex+1) @@ -1305,10 +1305,10 @@ class DscParser(MetaFileParser): Macros.update(GlobalData.gGlobalDefines) try: Result = ValueExpression(self._ValueList[1], Macros)() - except SymbolNotFound, Exc: + except SymbolNotFound as Exc: EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1]) Result = False - except WrnExpression, Excpt: + except WrnExpression as Excpt: # # Catch expression evaluation warning here. We need to report # the precise number of line and return the evaluation result @@ -1317,7 +1317,7 @@ class DscParser(MetaFileParser): File=self._FileWithError, ExtraData=' '.join(self._ValueList), Line=self._LineIndex+1) Result = Excpt.result - except BadExpression, Exc: + except BadExpression as Exc: EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1]) Result = False @@ -1437,13 +1437,13 @@ class DscParser(MetaFileParser): PcdValue = ValueList[0] try: ValueList[0] = ValueExpression(PcdValue, self._Macros)(True) - except WrnExpression, Value: + except WrnExpression as Value: ValueList[0] = Value.result else: PcdValue = ValueList[-1] try: ValueList[-1] = ValueExpression(PcdValue, self._Macros)(True) - except WrnExpression, Value: + except WrnExpression as Value: ValueList[-1] = Value.result if ValueList[-1] == 'True': diff --git a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py b/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py index b93588eea61a..4ce8edf5573a 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 = xml.dom.minidom.parse(XmlFile) XmlFile.close() return Dom - except Exception, X: + except Exception as X: print X return "" diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py index 35b7405e550d..8a4b10727a07 100644 --- a/BaseTools/Source/Python/Ecc/c.py +++ b/BaseTools/Source/Python/Ecc/c.py @@ -2627,7 +2627,7 @@ if __name__ == '__main__': # CollectSourceCodeDataIntoDB(sys.argv[1]) try: test_file = sys.argv[1] - except IndexError, v: + except IndexError as v: print "Usage: %s filename" % sys.argv[0] sys.exit(1) MsgList = CheckFuncHeaderDoxygenComments(test_file) diff --git a/BaseTools/Source/Python/Eot/CParser.py b/BaseTools/Source/Python/Eot/CParser.py index baa521f43cc4..39883aca07c4 100644 --- a/BaseTools/Source/Python/Eot/CParser.py +++ b/BaseTools/Source/Python/Eot/CParser.py @@ -180,7 +180,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -539,7 +539,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -816,7 +816,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -971,7 +971,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1099,7 +1099,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1169,7 +1169,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1223,7 +1223,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1270,7 +1270,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1439,7 +1439,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1472,7 +1472,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1596,7 +1596,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1643,7 +1643,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1706,7 +1706,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1749,7 +1749,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1868,7 +1868,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -1928,7 +1928,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2010,7 +2010,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2165,7 +2165,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2230,7 +2230,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2282,7 +2282,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2329,7 +2329,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -2471,7 +2471,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3063,7 +3063,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3213,7 +3213,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3469,7 +3469,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3535,7 +3535,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3624,7 +3624,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3832,7 +3832,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3888,7 +3888,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -3978,7 +3978,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4226,7 +4226,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4577,7 +4577,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4697,7 +4697,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4777,7 +4777,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4842,7 +4842,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -4940,7 +4940,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5019,7 +5019,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5110,7 +5110,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5210,7 +5210,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5362,7 +5362,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5590,7 +5590,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5651,7 +5651,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5698,7 +5698,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -5796,7 +5796,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6002,7 +6002,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6072,7 +6072,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -6107,7 +6107,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8142,7 +8142,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8177,7 +8177,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8224,7 +8224,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8292,7 +8292,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8362,7 +8362,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8422,7 +8422,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8482,7 +8482,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8542,7 +8542,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8602,7 +8602,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8676,7 +8676,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8750,7 +8750,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -8824,7 +8824,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9065,7 +9065,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9162,7 +9162,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9235,7 +9235,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -9308,7 +9308,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -12474,7 +12474,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -12567,7 +12567,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -14537,7 +14537,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16258,7 +16258,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16329,7 +16329,7 @@ class CParser(Parser): retval.stop = self.input.LT(-1) - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16442,7 +16442,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16593,7 +16593,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: @@ -16710,7 +16710,7 @@ class CParser(Parser): - except RecognitionException, re: + except RecognitionException as re: self.reportError(re) self.recover(self.input, re) finally: diff --git a/BaseTools/Source/Python/Eot/FvImage.py b/BaseTools/Source/Python/Eot/FvImage.py index 0f742c7d86c2..6696623aba68 100644 --- a/BaseTools/Source/Python/Eot/FvImage.py +++ b/BaseTools/Source/Python/Eot/FvImage.py @@ -1411,7 +1411,7 @@ def Main(): try: Option = GetOptions() build.main() - except Exception, e: + except Exception as e: print e return 1 diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py index 0190be884a33..15b2b792b2e1 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -938,7 +938,7 @@ class FdfParser: return ValueExpression(Expression, MacroPcdDict)(True) else: return ValueExpression(Expression, MacroPcdDict)() - except WrnExpression, Excpt: + except WrnExpression as Excpt: # # Catch expression evaluation warning here. We need to report # the precise number of line and return the evaluation result @@ -947,7 +947,7 @@ class FdfParser: File=self.FileName, ExtraData=self.__CurrentLine(), Line=Line) return Excpt.result - except Exception, Excpt: + except Exception as Excpt: if hasattr(Excpt, 'Pcd'): if Excpt.Pcd in GlobalData.gPlatformOtherPcds: Info = GlobalData.gPlatformOtherPcds[Excpt.Pcd] @@ -1414,7 +1414,7 @@ class FdfParser: while self.__GetFd() or self.__GetFv() or self.__GetFmp() or self.__GetCapsule() or self.__GetVtf() or self.__GetRule() or self.__GetOptionRom(): pass - except Warning, X: + except Warning as X: self.__UndoToken() #'\n\tGot Token: \"%s\" from File %s\n' % (self.__Token, FileLineTuple[0]) + \ # At this point, the closest parent would be the included file itself @@ -4817,7 +4817,7 @@ if __name__ == "__main__": import sys try: test_file = sys.argv[1] - except IndexError, v: + except IndexError as v: print "Usage: %s filename" % sys.argv[0] sys.exit(1) @@ -4825,7 +4825,7 @@ if __name__ == "__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/Python/GenFds/GenFds.py index 4a5d6f476abd..51b79397337c 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -337,10 +337,10 @@ def main(): """Display FV space info.""" GenFds.DisplayFvSpaceInfo(FdfParserObj) - except FdfParser.Warning, X: + except FdfParser.Warning as X: EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError=False) ReturnCode = FORMAT_INVALID - except FatalError, X: + except FatalError as X: if Options.debug != None: import traceback EdkLogger.quiet(traceback.format_exc()) diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py index 371d5a8217f7..da955fe1a4f7 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -722,7 +722,7 @@ class GenFdsGlobalVariable: try: PopenObject = subprocess.Popen(' '.join(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) - except Exception, X: + except Exception as X: EdkLogger.error("GenFds", COMMAND_FAILURE, ExtraData="%s: %s" % (str(X), cmd[0])) (out, error) = PopenObject.communicate() diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/Source/Python/TargetTool/TargetTool.py index bfdf763a7abc..882b016bf058 100644 --- a/BaseTools/Source/Python/TargetTool/TargetTool.py +++ b/BaseTools/Source/Python/TargetTool/TargetTool.py @@ -254,7 +254,7 @@ if __name__ == '__main__': FileHandle.RWFile('#', '=', 0) else: FileHandle.RWFile('#', '=', 1) - except Exception, e: + except Exception as e: last_type, last_value, last_tb = sys.exc_info() traceback.print_exception(last_type, last_value, last_tb) diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py index d1e40b025caa..05ba86262133 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -667,7 +667,7 @@ def Main(): EdkLogger.SetLevel(CommandOptions.LogLevel + 1) else: EdkLogger.SetLevel(CommandOptions.LogLevel) - except FatalError, X: + except FatalError as X: return 1 try: @@ -687,7 +687,7 @@ def Main(): if CommandOptions.OutputFile == None: CommandOptions.OutputFile = os.path.splitext(InputFile)[0] + '.iii' TrimPreprocessedFile(InputFile, CommandOptions.OutputFile, CommandOptions.ConvertHex, CommandOptions.TrimLong) - except FatalError, X: + except FatalError as X: import platform import traceback if CommandOptions != None and CommandOptions.LogLevel <= EdkLogger.DEBUG_9: diff --git a/BaseTools/Source/Python/UPT/Core/DependencyRules.py b/BaseTools/Source/Python/UPT/Core/DependencyRules.py index 26c5a97da80f..3a7c9809e31a 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 == EDK1_INF_ERROR: Logger.Warn("UPT", ST.WRN_EDK1_INF_FOUND%Path) @@ -446,7 +446,7 @@ def VerifyReplaceModuleDep(Path, DpPackagePathList, OtherPkgList): return False else: return True - except FatalError, ErrCode: + except FatalError as ErrCode: if ErrCode.message == 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())] = ModuleObj PackageObj.SetModuleDict(ModuleDict) - except FatalError, ErrCode: + except FatalError as ErrCode: if ErrCode.message == EDK1_INF_ERROR: Logger.Warn("UPT", ST.WRN_EDK1_INF_FOUND%Filename) @@ -181,7 +181,7 @@ class DistributionPackageClass(object): ModuleObj.GetName(), ModuleObj.GetCombinePath()) self.ModuleSurfaceArea[ModuleKey] = ModuleObj - except FatalError, ErrCode: + except FatalError as ErrCode: if ErrCode.message == EDK1_INF_ERROR: Logger.Error("UPT", EDK1_INF_ERROR, diff --git a/BaseTools/Source/Python/UPT/Core/IpiDb.py b/BaseTools/Source/Python/UPT/Core/IpiDb.py index f147963288ad..baf687ef99ba 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) - 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/Source/Python/UPT/Core/PackageFile.py index 5fafd85bffbf..db4725b1a56d 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 = {} for Filename in self._ZipFile.namelist(): self._Files[os.path.normpath(Filename)] = Filename - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_OPEN_FAILURE, ExtraData="%s (%s)" % (FileName, str(Xstr))) @@ -106,7 +106,7 @@ class PackageFile: ExtraData="[%s] in %s" % (Which, self._FileName)) try: FileContent = self._ZipFile.read(self._Files[Which]) - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_DECOMPRESS_FAILURE, ExtraData="[%s] in %s (%s)" % (Which, \ self._FileName, \ @@ -119,14 +119,14 @@ class PackageFile: return else: ToFile = __FileHookOpen__(ToDest, 'wb') - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_OPEN_FAILURE, ExtraData="%s (%s)" % (ToDest, str(Xstr))) try: ToFile.write(FileContent) ToFile.close() - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_WRITE_FAILURE, ExtraData="%s (%s)" % (ToDest, str(Xstr))) @@ -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="%s (%s)" % (File, str(Xstr))) @@ -242,7 +242,7 @@ class PackageFile: if os.path.splitext(ArcName)[1].lower() == '.pkg': Data = Data.encode('utf_8') self._ZipFile.writestr(ArcName, Data) - except BaseException, Xstr: + except BaseException as Xstr: Logger.Error("PackagingTool", FILE_COMPRESS_FAILURE, ExtraData="%s (%s)" % (ArcName, str(Xstr))) diff --git a/BaseTools/Source/Python/UPT/InstallPkg.py b/BaseTools/Source/Python/UPT/InstallPkg.py index a8d0e1ec440a..e268f7892290 100644 --- a/BaseTools/Source/Python/UPT/InstallPkg.py +++ b/BaseTools/Source/Python/UPT/InstallPkg.py @@ -537,7 +537,7 @@ def Main(Options = None): Options, Dep, WorkspaceDir, DataBase) ReturnCode = 0 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode = XExcept.args[0] if Logger.GetLevel() <= 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 = None): DataBase = GlobalData.gDB InventoryDistInstalled(DataBase) ReturnCode = 0 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode = XExcept.args[0] if Logger.GetLevel() <= 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/BaseTools/Source/Python/UPT/Library/CommentParsing.py index e6d45103f94b..9cd7b60e16ab 100644 --- a/BaseTools/Source/Python/UPT/Library/CommentParsing.py +++ b/BaseTools/Source/Python/UPT/Library/CommentParsing.py @@ -217,7 +217,7 @@ def ParsePcdErrorCode (Value = None, ContainerFile = None, LineNum = None): # To delete the tailing 'L' # return hex(ErrorCode)[:-1] - except ValueError, XStr: + except ValueError as XStr: if XStr: pass Logger.Error('Parser', diff --git a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py b/BaseTools/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 != 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 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 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, '' diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py index 1fbbf2e49887..b00bba1f8440 100644 --- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py +++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py @@ -329,9 +329,9 @@ class UniFileClassObject(object): if len(Lang) != 3: try: FileIn = codecs.open(File.Path, mode='rb', encoding='utf_8').readlines() - except UnicodeError, Xstr: + except UnicodeError as Xstr: FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').readlines() - except UnicodeError, Xstr: + except UnicodeError as Xstr: FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines() except: EdkLogger.Error("Unicode File Parser", @@ -438,7 +438,7 @@ class UniFileClassObject(object): try: FileIn = codecs.open(File.Path, mode='rb', encoding='utf_8').readlines() - except UnicodeError, Xstr: + except UnicodeError as Xstr: FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').readlines() except UnicodeError: FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines() @@ -1060,7 +1060,7 @@ class UniFileClassObject(object): ExtraData=FilaPath) try: FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_8').readlines() - except UnicodeError, Xstr: + except UnicodeError as Xstr: FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16').readlines() except UnicodeError: FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16_le').readlines() diff --git a/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py b/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py index d7614b884990..fd02efb6bf04 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 = 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=FileName, RaiseError=True) diff --git a/BaseTools/Source/Python/UPT/MkPkg.py b/BaseTools/Source/Python/UPT/MkPkg.py index 87c84f0cc25b..99d6bcc19220 100644 --- a/BaseTools/Source/Python/UPT/MkPkg.py +++ b/BaseTools/Source/Python/UPT/MkPkg.py @@ -213,7 +213,7 @@ def Main(Options = None): Logger.Quiet(ST.MSG_FINISH) ReturnCode = 0 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode = XExcept.args[0] if Logger.GetLevel() <= Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % \ diff --git a/BaseTools/Source/Python/UPT/ReplacePkg.py b/BaseTools/Source/Python/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 = None): InstallDp(DistPkg, DpPkgFileName, ContentZipFile, Options, Dep, WorkspaceDir, DataBase) ReturnCode = 0 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode = XExcept.args[0] if Logger.GetLevel() <= 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 = None): ReturnCode = 0 - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode = XExcept.args[0] if Logger.GetLevel() <= 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=None): else: Logger.Quiet(ST.MSG_TEST_INSTALL_FAIL) - except TE.FatalError, XExcept: + except TE.FatalError as XExcept: ReturnCode = XExcept.args[0] if Logger.GetLevel() <= Logger.DEBUG_9: Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc()) - except Exception, x: + except Exception as x: ReturnCode = TE.CODE_ERROR Logger.Error( "\nTestInstallPkg", diff --git a/BaseTools/Source/Python/UPT/UPT.py b/BaseTools/Source/Python/UPT/UPT.py index 325b96bf560d..0bfcc44e3f19 100644 --- a/BaseTools/Source/Python/UPT/UPT.py +++ b/BaseTools/Source/Python/UPT/UPT.py @@ -179,7 +179,7 @@ def Main(): try: GlobalData.gWORKSPACE, GlobalData.gPACKAGE_PATH = GetWorkspace() - except FatalError, XExcept: + except FatalError as XExcept: if Logger.GetLevel() <= 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 ReturnCode = RunModule(Opt) - except FatalError, XExcept: + except FatalError as XExcept: ReturnCode = XExcept.args[0] if Logger.GetLevel() <= 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 4a87fd176294..5824266dc4fe 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -819,11 +819,11 @@ class DscBuildData(PlatformBuildClassObject): if ValueList[Index] and PcdType not in [MODEL_PCD_FEATURE_FLAG, MODEL_PCD_FIXED_AT_BUILD]: try: ValueList[Index] = ValueExpression(ValueList[Index], GlobalData.gPlatformPcds)(True) - except WrnExpression, Value: + except WrnExpression as Value: ValueList[Index] = Value.result - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, Value, File=self.MetaFile, Line=self._LineIndex + 1) - 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" @@ -840,7 +840,7 @@ class DscBuildData(PlatformBuildClassObject): DatumType = self._DecPcds[PcdCName, TokenSpaceGuid].DatumType try: ValueList[Index] = ValueExpressionEx(ValueList[Index], DatumType, self._GuidDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, Value, File=self.MetaFile, Line=LineNo, ExtraData="PCD [%s.%s] Value \"%s\" " % (TokenSpaceGuid, PcdCName, ValueList[Index])) Valid, ErrStr = CheckPcdDatum(self._DecPcds[PcdCName, TokenSpaceGuid].DatumType, ValueList[Index]) diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py index 7ea9b56d5dec..67c08ee47841 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -1148,7 +1148,7 @@ class InfBuildData(ModuleBuildClassObject): else: try: Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, Pcd.DatumType, self.Guids)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(TokenSpaceGuid, PcdRealName, Pcd.DefaultValue, Value), File=self.MetaFile, Line=LineNo) break diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py index b2b0e282eb91..74fa4d31b109 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -1327,7 +1327,7 @@ class DscParser(MetaFileParser): self._InSubsection = False try: Processer[self._ItemType]() - except EvaluationException, Excpt: + except EvaluationException as Excpt: # # Only catch expression evaluation error here. We need to report # the precise number of line on which the error occurred @@ -1349,7 +1349,7 @@ class DscParser(MetaFileParser): EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt), File=self._FileWithError, ExtraData=' '.join(self._ValueList), Line=self._LineIndex + 1) - except MacroException, Excpt: + except MacroException as Excpt: EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt), File=self._FileWithError, ExtraData=' '.join(self._ValueList), Line=self._LineIndex + 1) @@ -1447,10 +1447,10 @@ class DscParser(MetaFileParser): Macros.update(GlobalData.gGlobalDefines) try: Result = ValueExpression(self._ValueList[1], Macros)() - except SymbolNotFound, Exc: + except SymbolNotFound as Exc: EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1]) Result = False - except WrnExpression, Excpt: + except WrnExpression as Excpt: # # Catch expression evaluation warning here. We need to report # the precise number of line and return the evaluation result @@ -1591,7 +1591,7 @@ class DscParser(MetaFileParser): if PcdValue and "." not in self._ValueList[0]: try: ValList[Index] = ValueExpression(PcdValue, self._Macros)(True) - except WrnExpression, Value: + except WrnExpression as Value: ValList[Index] = Value.result if ValList[Index] == 'True': @@ -1988,15 +1988,15 @@ class DecParser(MetaFileParser): if PcdValue: try: ValueList[0] = ValueExpression(PcdValue, self._AllPcdDict)(True) - except WrnExpression, Value: + except WrnExpression as Value: ValueList[0] = Value.result - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, Value, File=self.MetaFile, Line=self._LineIndex + 1) if ValueList[0]: try: ValueList[0] = ValueExpressionEx(ValueList[0], ValueList[1], self._GuidDict)(True) - except BadExpression, Value: + except BadExpression as Value: EdkLogger.error('Parser', FORMAT_INVALID, Value, ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1) # check format of default value against the datum type IsValid, Cause = CheckPcdDatum(ValueList[1], ValueList[0]) diff --git a/BaseTools/Source/Python/Workspace/MetaFileTable.py b/BaseTools/Source/Python/Workspace/MetaFileTable.py index d8549c9d66e6..92fcf6dd2b22 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, TimeStamp) 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 = comment.replace("@Expression", "", 1) expressions.append(comment.split("|")[1].strip()) - except Exception, Exc: + except Exception as Exc: ValidType = "" if oricomment.startswith("@ValidRange"): ValidType = "@ValidRange" diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py index d6e943d2f1d4..c3bfecf8cc66 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -649,7 +649,7 @@ class ModuleReport(object): cmd = ["GenFw", "--rebase", str(0), "-o", Tempfile, DefaultEFIfile] try: PopenObject = subprocess.Popen(' '.join(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) - except Exception, X: + except Exception as X: EdkLogger.error("GenFw", COMMAND_FAILURE, ExtraData="%s: %s" % (str(X), cmd[0])) EndOfProcedure = threading.Event() EndOfProcedure.clear() diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index de19756d99cb..0379fd8baf1e 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -546,7 +546,7 @@ class BuildTask: EdkLogger.debug(EdkLogger.DEBUG_8, "Threads [%s]" % ", ".join([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 user can # catch the error message easily @@ -1316,7 +1316,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=str(X)) return True @@ -1406,7 +1406,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=str(X)) return True @@ -2488,14 +2488,14 @@ def Main(): # All job done, no error found and no exception raised # BuildError = False - except FatalError, X: + except FatalError as X: if MyBuild != None: # for multi-thread build exits safely MyBuild.Relinquish() if Option != None and Option.debug != None: EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc()) ReturnCode = X.args[0] - except Warning, X: + except Warning as X: # error from Fdf parser if MyBuild != None: # for multi-thread build exits safely diff --git a/BaseTools/Tests/CheckPythonSyntax.py b/BaseTools/Tests/CheckPythonSyntax.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=True) - except Exception, e: + except Exception as e: self.fail('syntax error: %s, Error is %s' % (filename, str(e))) def MakePythonSyntaxCheckTests(): diff --git a/BaseTools/gcc/mingw-gcc-build.py b/BaseTools/gcc/mingw-gcc-build.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 - except Exception, e: + except Exception as e: print e if not completed: return False -- 2.15.1