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>

5 files changed, 81 insertions, 81 deletions

diff --git a/BaseTools/Source/Python/Ecc/CParser.py b/BaseTools/Source/Python/Ecc/CParser.py
index 94711a9a37..ddc6cbd506 100644
--- a/BaseTools/Source/Python/Ecc/CParser.py
+++ b/BaseTools/Source/Python/Ecc/CParser.py
@@ -173,7 +173,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -532,7 +532,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -809,7 +809,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -964,7 +964,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1092,7 +1092,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1162,7 +1162,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1216,7 +1216,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1263,7 +1263,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1432,7 +1432,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1465,7 +1465,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1589,7 +1589,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1636,7 +1636,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1699,7 +1699,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1742,7 +1742,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1861,7 +1861,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -1921,7 +1921,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -2003,7 +2003,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -2158,7 +2158,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -2223,7 +2223,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -2275,7 +2275,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -2322,7 +2322,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -2464,7 +2464,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -3056,7 +3056,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -3206,7 +3206,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -3462,7 +3462,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -3528,7 +3528,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -3617,7 +3617,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -3825,7 +3825,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -3881,7 +3881,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -3971,7 +3971,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -4219,7 +4219,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -4570,7 +4570,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -4690,7 +4690,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -4770,7 +4770,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -4835,7 +4835,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -4933,7 +4933,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -5012,7 +5012,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -5103,7 +5103,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -5203,7 +5203,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -5355,7 +5355,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -5583,7 +5583,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -5644,7 +5644,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -5691,7 +5691,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -5789,7 +5789,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -5995,7 +5995,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -6065,7 +6065,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -6100,7 +6100,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8135,7 +8135,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8170,7 +8170,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8217,7 +8217,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8285,7 +8285,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8355,7 +8355,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8415,7 +8415,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8475,7 +8475,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8535,7 +8535,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8595,7 +8595,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8669,7 +8669,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8743,7 +8743,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -8817,7 +8817,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -9058,7 +9058,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -9155,7 +9155,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -9228,7 +9228,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -9301,7 +9301,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -12467,7 +12467,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -12560,7 +12560,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -14530,7 +14530,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -16251,7 +16251,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -16322,7 +16322,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -16435,7 +16435,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -16586,7 +16586,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

@@ -16703,7 +16703,7 @@ class CParser(Parser):
 

 

 

-            except RecognitionException, re:

+            except RecognitionException as re:

                 self.reportError(re)

                 self.recover(self.input, re)

         finally:

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':

diff --git a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py b/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py
index a86f19624c..d5fb80fcf9 100644
--- a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py
+++ b/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py
@@ -214,7 +214,7 @@ def XmlParseFile(FileName):
         Dom = xml.dom.minidom.parse(XmlFile)

         XmlFile.close()

         return Dom

-    except Exception, X:

+    except Exception as X:

         print X

         return ""

 

diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py
index 93ee1990ba..99b22725e6 100644
--- a/BaseTools/Source/Python/Ecc/c.py
+++ b/BaseTools/Source/Python/Ecc/c.py
@@ -2633,7 +2633,7 @@ if __name__ == '__main__':
 #    CollectSourceCodeDataIntoDB(sys.argv[1])

     try:

         test_file = sys.argv[1]

-    except IndexError, v:

+    except IndexError as v:

         print "Usage: %s filename" % sys.argv[0]

         sys.exit(1)

     MsgList = CheckFuncHeaderDoxygenComments(test_file)