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>

4 files changed, 19 insertions, 19 deletions

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 9e9d9fdc02..7b04dcdb36 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -307,7 +307,7 @@ class ValueExpression(BaseExpression):
         }

         try:

             Val = eval(EvalStr, {}, Dict)

-        except Exception, Excpt:

+        except Exception as Excpt:

             raise BadExpression(str(Excpt))

 

         if Operator in {'and', 'or'}:

@@ -425,7 +425,7 @@ class ValueExpression(BaseExpression):
                 continue

             try:

                 Val = self.Eval(Op, Val, EvalFunc())

-            except WrnExpression, Warn:

+            except WrnExpression as Warn:

                 self._WarnExcept = Warn

                 Val = Warn.result

         return Val

@@ -464,7 +464,7 @@ class ValueExpression(BaseExpression):
                 Op += ' ' + self._Token

             try:

                 Val = self.Eval(Op, Val, self._RelExpr())

-            except WrnExpression, Warn:

+            except WrnExpression as Warn:

                 self._WarnExcept = Warn

                 Val = Warn.result

         return Val

@@ -490,14 +490,14 @@ class ValueExpression(BaseExpression):
             Val = self._UnaryExpr()

             try:

                 return self.Eval('not', Val)

-            except WrnExpression, Warn:

+            except WrnExpression as Warn:

                 self._WarnExcept = Warn

                 return Warn.result

         if self._IsOperator({"~"}):

             Val = self._UnaryExpr()

             try:

                 return self.Eval('~', Val)

-            except WrnExpression, Warn:

+            except WrnExpression as Warn:

                 self._WarnExcept = Warn

                 return Warn.result

         return self._IdenExpr()

@@ -816,9 +816,9 @@ class ValueExpressionEx(ValueExpression):
             elif self.PcdType in TAB_PCD_NUMERIC_TYPES and (PcdValue.startswith("'") or \

                       PcdValue.startswith('"') or PcdValue.startswith("L'") or PcdValue.startswith('L"') or PcdValue.startswith('{')):

                 raise BadExpression

-        except WrnExpression, Value:

+        except WrnExpression as Value:

             PcdValue = Value.result

-        except BadExpression, Value:

+        except BadExpression as Value:

             if self.PcdType in TAB_PCD_NUMERIC_TYPES:

                 PcdValue = PcdValue.strip()

                 if PcdValue.startswith('{') and PcdValue.endswith('}'):

@@ -854,7 +854,7 @@ class ValueExpressionEx(ValueExpression):
                                 tmpValue = int(Item, 0)

                                 if tmpValue > 255:

                                     raise BadExpression("Byte  array number %s should less than 0xFF." % Item)

-                            except BadExpression, Value:

+                            except BadExpression as Value:

                                 raise BadExpression(Value)

                             except ValueError:

                                 pass

@@ -870,7 +870,7 @@ class ValueExpressionEx(ValueExpression):
                 else:

                     try:

                         TmpValue, Size = ParseFieldValue(PcdValue)

-                    except BadExpression, Value:

+                    except BadExpression as Value:

                         raise BadExpression("Type: %s, Value: %s, %s" % (self.PcdType, PcdValue, Value))

                 if type(TmpValue) == type(''):

                     try:

@@ -1030,8 +1030,8 @@ if __name__ == '__main__':
         try:

             print ValueExpression(input)(True)

             print ValueExpression(input)(False)

-        except WrnExpression, Ex:

+        except WrnExpression as Ex:

             print Ex.result

             print str(Ex)

-        except Exception, Ex:

+        except Exception as Ex:

             print str(Ex)

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 24706ebe50..5197818d3f 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -478,7 +478,7 @@ def SaveFileOnChange(File, Content, IsBinaryFile=True):
             Fd = open(File, "wb")

             Fd.write(Content)

             Fd.close()

-    except IOError, X:

+    except IOError as X:

         EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X)

 

     return True

@@ -512,7 +512,7 @@ def DataRestore(File):
     try:

         Fd = open(File, 'rb')

         Data = cPickle.load(Fd)

-    except Exception, e:

+    except Exception as e:

         EdkLogger.verbose("Failed to load [%s]\n\t%s" % (File, str(e)))

         Data = None

     finally:

@@ -1278,7 +1278,7 @@ def ParseDevPathValue (Value):
     try:

         p = subprocess.Popen(Cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

         out, err = p.communicate()

-    except Exception, X:

+    except Exception as X:

         raise BadExpression("DevicePath: %s" % (str(X)) )

     finally:

         subprocess._cleanup()

@@ -1327,7 +1327,7 @@ def ParseFieldValue (Value):
             Value = Value[1:-1]

         try:

             Value = "'" + uuid.UUID(Value).get_bytes_le() + "'"

-        except ValueError, Message:

+        except ValueError as Message:

             raise BadExpression(Message)

         Value, Size = ParseFieldValue(Value)

         return Value, 16

diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index 7f504d6e31..b6f9944705 100644
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -422,7 +422,7 @@ class RangeExpression(BaseExpression):
             Op = self._Token

             try:

                 Val = self.Eval(Op, Val, EvalFunc())

-            except WrnExpression, Warn:

+            except WrnExpression as Warn:

                 self._WarnExcept = Warn

                 Val = Warn.result

         return Val

@@ -445,7 +445,7 @@ class RangeExpression(BaseExpression):
                 Op += ' ' + self._Token

             try:

                 Val = self.Eval(Op, Val, self._RelExpr())

-            except WrnExpression, Warn:

+            except WrnExpression as Warn:

                 self._WarnExcept = Warn

                 Val = Warn.result

         return Val

@@ -457,7 +457,7 @@ class RangeExpression(BaseExpression):
             Val = self._NeExpr()

             try:

                 return self.Eval(Token, Val)

-            except WrnExpression, Warn:

+            except WrnExpression as Warn:

                 self._WarnExcept = Warn

                 return Warn.result

         return self._IdenExpr()

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 2b447772ea..8ff544ed76 100644
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -245,7 +245,7 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName):
                                         stdout=subprocess.PIPE, 

                                         stderr= subprocess.PIPE,

                                         shell=True)

-    except Exception, X:

+    except Exception as X:

         EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, ExtraData=str(X))

     (out, error) = PopenObject.communicate()

     print out