BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Source / Python / Ecc / CParser.py

diff --git a/BaseTools/Source/Python/Ecc/CParser.py b/BaseTools/Source/Python/Ecc/CParser.py
index 94711a9a378ad9ab8177798b84ffdeb487847a32..ddc6cbd506aa637ac87beb018339d77743c78bc9 100644 (file)
--- a/BaseTools/Source/Python/Ecc/CParser.py
+++ b/BaseTools/Source/Python/Ecc/CParser.py
@@ -173,7 +173,7 @@ class CParser(Parser):
 \r
 \r
 \r
 \r
 \r
 \r

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r


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

-            except RecognitionException, re:\r
+            except RecognitionException as re:\r

                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r