BaseTools: Refactor python except statements
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 <yonghong.zhu@intel.com> Cc: Liming Gao <liming.gao@intel.com> Signed-off-by: Gary Lin <glin@suse.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
@@ -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',
|
||||
|
@@ -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, ''
|
||||
|
||||
|
@@ -327,9 +327,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",
|
||||
@@ -436,7 +436,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()
|
||||
@@ -1042,7 +1042,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()
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user