BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Source / Python / Common / Expression.py

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 9e9d9fdc02e7e075e56468d8eac31226e6fd1946..7b04dcdb36ccf4172a018dff37d8baccbaeef43b 100644 (file)
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -307,7 +307,7 @@ class ValueExpression(BaseExpression):
         }\r
         try:\r
             Val = eval(EvalStr, {}, Dict)\r
-        except Exception, Excpt:\r
+        except Exception as Excpt:\r
             raise BadExpression(str(Excpt))\r
 \r
         if Operator in {'and', 'or'}:\r
@@ -425,7 +425,7 @@ class ValueExpression(BaseExpression):
                 continue\r
             try:\r
                 Val = self.Eval(Op, Val, EvalFunc())\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 Val = Warn.result\r
         return Val\r
@@ -464,7 +464,7 @@ class ValueExpression(BaseExpression):
                 Op += ' ' + self._Token\r
             try:\r
                 Val = self.Eval(Op, Val, self._RelExpr())\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 Val = Warn.result\r
         return Val\r
@@ -490,14 +490,14 @@ class ValueExpression(BaseExpression):
             Val = self._UnaryExpr()\r
             try:\r
                 return self.Eval('not', Val)\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 return Warn.result\r
         if self._IsOperator({"~"}):\r
             Val = self._UnaryExpr()\r
             try:\r
                 return self.Eval('~', Val)\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 return Warn.result\r
         return self._IdenExpr()\r
@@ -816,9 +816,9 @@ class ValueExpressionEx(ValueExpression):
             elif self.PcdType in TAB_PCD_NUMERIC_TYPES and (PcdValue.startswith("'") or \\r
                       PcdValue.startswith('"') or PcdValue.startswith("L'") or PcdValue.startswith('L"') or PcdValue.startswith('{')):\r
                 raise BadExpression\r
-        except WrnExpression, Value:\r
+        except WrnExpression as Value:\r
             PcdValue = Value.result\r
-        except BadExpression, Value:\r
+        except BadExpression as Value:\r
             if self.PcdType in TAB_PCD_NUMERIC_TYPES:\r
                 PcdValue = PcdValue.strip()\r
                 if PcdValue.startswith('{') and PcdValue.endswith('}'):\r
@@ -854,7 +854,7 @@ class ValueExpressionEx(ValueExpression):
                                 tmpValue = int(Item, 0)\r
                                 if tmpValue > 255:\r
                                     raise BadExpression("Byte  array number %s should less than 0xFF." % Item)\r
-                            except BadExpression, Value:\r
+                            except BadExpression as Value:\r
                                 raise BadExpression(Value)\r
                             except ValueError:\r
                                 pass\r
@@ -870,7 +870,7 @@ class ValueExpressionEx(ValueExpression):
                 else:\r
                     try:\r
                         TmpValue, Size = ParseFieldValue(PcdValue)\r
-                    except BadExpression, Value:\r
+                    except BadExpression as Value:\r
                         raise BadExpression("Type: %s, Value: %s, %s" % (self.PcdType, PcdValue, Value))\r
                 if type(TmpValue) == type(''):\r
                     try:\r
@@ -1030,8 +1030,8 @@ if __name__ == '__main__':
         try:\r
             print ValueExpression(input)(True)\r
             print ValueExpression(input)(False)\r
-        except WrnExpression, Ex:\r
+        except WrnExpression as Ex:\r
             print Ex.result\r
             print str(Ex)\r
-        except Exception, Ex:\r
+        except Exception as Ex:\r
             print str(Ex)\r