diff options
| author | Gary Lin <glin@suse.com> | 2018-06-25 18:31:25 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-06-27 16:31:30 +0800 |
| commit | 5b0671c1e514e534c6d5be9604da33bfc2cd0a24 (patch) | |
| tree | 7e9dbe54574d43494ef71e57f008074295217c82 /BaseTools/Source/Python/UPT/Library/ExpressionValidate.py | |
| parent | 00eb12a2c768cae3ca136110baacb5a35e9066a8 (diff) | |
| download | edk2-5b0671c1e514e534c6d5be9604da33bfc2cd0a24.tar.gz edk2-5b0671c1e514e534c6d5be9604da33bfc2cd0a24.tar.bz2 edk2-5b0671c1e514e534c6d5be9604da33bfc2cd0a24.zip | |
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>
Diffstat (limited to 'BaseTools/Source/Python/UPT/Library/ExpressionValidate.py')
| -rw-r--r-- | BaseTools/Source/Python/UPT/Library/ExpressionValidate.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py b/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py index 090c7eb957..ca21e69952 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, ''
|