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>
This commit is contained in:
Gary Lin
2018-06-25 18:31:25 +08:00
committed by Yonghong Zhu
parent 00eb12a2c7
commit 5b0671c1e5
46 changed files with 254 additions and 250 deletions

View File

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