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>

1 files changed, 11 insertions, 11 deletions

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 9e9d9fdc02..7b04dcdb36 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -307,7 +307,7 @@ class ValueExpression(BaseExpression):
         }

         try:

             Val = eval(EvalStr, {}, Dict)

-        except Exception, Excpt:

+        except Exception as Excpt:

             raise BadExpression(str(Excpt))

 

         if Operator in {'and', 'or'}:

@@ -425,7 +425,7 @@ class ValueExpression(BaseExpression):
                 continue

             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 ValueExpression(BaseExpression):
                 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

@@ -490,14 +490,14 @@ class ValueExpression(BaseExpression):
             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()

@@ -816,9 +816,9 @@ class ValueExpressionEx(ValueExpression):
             elif self.PcdType in TAB_PCD_NUMERIC_TYPES and (PcdValue.startswith("'") or \

                       PcdValue.startswith('"') or PcdValue.startswith("L'") or PcdValue.startswith('L"') or PcdValue.startswith('{')):

                 raise BadExpression

-        except WrnExpression, Value:

+        except WrnExpression as Value:

             PcdValue = Value.result

-        except BadExpression, Value:

+        except BadExpression as Value:

             if self.PcdType in TAB_PCD_NUMERIC_TYPES:

                 PcdValue = PcdValue.strip()

                 if PcdValue.startswith('{') and PcdValue.endswith('}'):

@@ -854,7 +854,7 @@ class ValueExpressionEx(ValueExpression):
                                 tmpValue = int(Item, 0)

                                 if tmpValue > 255:

                                     raise BadExpression("Byte  array number %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 = ParseFieldValue(PcdValue)

-                    except BadExpression, Value:

+                    except BadExpression as Value:

                         raise BadExpression("Type: %s, Value: %s, %s" % (self.PcdType, PcdValue, Value))

                 if type(TmpValue) == type(''):

                     try:

@@ -1030,8 +1030,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)