BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / DscBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 1ed7eb1c2cf72983a1c08eb048edf6e985aeca6b..a001162e8e3b74315f90d1a837e0116b5f6d1f1a 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -120,7 +120,7 @@ def GetDependencyList(FileStack,SearchPathList):
             try:\r
                 Fd = open(F, 'r')\r
                 FileContent = Fd.read()\r
-            except BaseException, X:\r
+            except BaseException as X:\r
                 EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F + "\n\t" + str(X))\r
             finally:\r
                 if "Fd" in dir(locals()):\r
@@ -887,11 +887,11 @@ class DscBuildData(PlatformBuildClassObject):
             DatumType = self._DecPcds[PcdCName, TokenSpaceGuid].DatumType\r
             try:\r
                 ValueList[Index] = ValueExpressionEx(ValueList[Index], DatumType, self._GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, Value, File=self.MetaFile, Line=LineNo,\r
                                 ExtraData="PCD [%s.%s] Value \"%s\" " % (\r
                                 TokenSpaceGuid, PcdCName, ValueList[Index]))\r
-            except EvaluationException, Excpt:\r
+            except EvaluationException as Excpt:\r
                 if hasattr(Excpt, 'Pcd'):\r
                     if Excpt.Pcd in GlobalData.gPlatformOtherPcds:\r
                         EdkLogger.error('Parser', FORMAT_INVALID, "Cannot use this PCD (%s) in an expression as"\r
@@ -1059,7 +1059,7 @@ class DscBuildData(PlatformBuildClassObject):
                 return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue[1:], PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:     \r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         elif PcdValue.startswith("L'") or PcdValue.startswith("'"):\r
@@ -1070,7 +1070,7 @@ class DscBuildData(PlatformBuildClassObject):
                 return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue, PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         elif PcdValue.startswith('L'):\r
@@ -1082,7 +1082,7 @@ class DscBuildData(PlatformBuildClassObject):
                 return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue, PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         else:\r
@@ -1109,7 +1109,7 @@ class DscBuildData(PlatformBuildClassObject):
                     return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue, PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         return PcdValue\r