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>

2 files changed, 8 insertions, 8 deletions

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py
index 760f88cc72..fc65e9a2bd 100644
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py
@@ -98,7 +98,7 @@ class Table(object):
         SqlCommand = """drop table IF EXISTS %s""" % self.Table

         try:

             self.Cur.execute(SqlCommand)

-        except Exception, e:

+        except Exception as e:

             print "An error occurred when Drop a table:", e.args[0]

 

     ## Get count

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index 3749f6a269..fd96bb9a3c 100644
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -1183,7 +1183,7 @@ class DscParser(MetaFileParser):
 

             try:

                 Processer[self._ItemType]()

-            except EvaluationException, Excpt:

+            except EvaluationException as Excpt:

                 # 

                 # Only catch expression evaluation error here. We need to report

                 # the precise number of line on which the error occurred

@@ -1192,7 +1192,7 @@ class DscParser(MetaFileParser):
 #                 EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt),

 #                                 File=self._FileWithError, ExtraData=' '.join(self._ValueList),

 #                                 Line=self._LineIndex+1)

-            except MacroException, Excpt:

+            except MacroException as Excpt:

                 EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt),

                                 File=self._FileWithError, ExtraData=' '.join(self._ValueList), 

                                 Line=self._LineIndex+1)

@@ -1305,10 +1305,10 @@ class DscParser(MetaFileParser):
             Macros.update(GlobalData.gGlobalDefines)

             try:

                 Result = ValueExpression(self._ValueList[1], Macros)()

-            except SymbolNotFound, Exc:

+            except SymbolNotFound as Exc:

                 EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1])

                 Result = False

-            except WrnExpression, Excpt:

+            except WrnExpression as Excpt:

                 # 

                 # Catch expression evaluation warning here. We need to report

                 # the precise number of line and return the evaluation result

@@ -1317,7 +1317,7 @@ class DscParser(MetaFileParser):
                                 File=self._FileWithError, ExtraData=' '.join(self._ValueList), 

                                 Line=self._LineIndex+1)

                 Result = Excpt.result

-            except BadExpression, Exc:

+            except BadExpression as Exc:

                 EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1])

                 Result = False

 

@@ -1437,13 +1437,13 @@ class DscParser(MetaFileParser):
             PcdValue = ValueList[0]      

             try:

                 ValueList[0] = ValueExpression(PcdValue, self._Macros)(True)

-            except WrnExpression, Value:

+            except WrnExpression as Value:

                 ValueList[0] = Value.result          

         else:

             PcdValue = ValueList[-1]

             try:

                 ValueList[-1] = ValueExpression(PcdValue, self._Macros)(True)

-            except WrnExpression, Value:

+            except WrnExpression as Value:

                 ValueList[-1] = Value.result

             

             if ValueList[-1] == 'True':