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>

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py
index 488949f24b6fcfc04cdae219156e4ab1355c4367..a177590af5972918f94eeb0f9efd98b6430e6982 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py
@@ -115,7 +115,7 @@ class DoxygenFile(Page):
             f = open(self.mFilename, 'w')\r
             f.write('\n'.join(str))\r
             f.close()\r
-        except IOError, e:\r
+        except IOError as e:\r
             ErrorMsg ('Fail to write file %s' % self.mFilename)\r
             return False\r
 \r
@@ -429,7 +429,7 @@ class DoxygenConfigFile:
             f = open(path, 'w')\r
             f.write(text)\r
             f.close()\r
-        except IOError, e:\r
+        except IOError as e:\r
             ErrorMsg ('Fail to generate doxygen config file %s' % path)\r
             return False\r
 \r

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
index 94b6588c0ddf43ca2e29546919e1e8ee99c1938c..c22d362ff3e12acba99a54c172162c604270d480 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
@@ -1001,7 +1001,7 @@ class PackageDocumentAction(DoxygenAction):
 \r
         try:\r
             file = open(path, 'rb')\r
-        except (IOError, OSError), msg:\r
+        except (IOError, OSError) as msg:\r
             return None\r
 \r
         t = file.read()\r

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py
index ca55929eda9a747fab68195e39d761c95c1a6aa9..4bae6968a96e9513b4a0f8c966c5ef1fe7fc6160 100644 (file)
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py
@@ -1004,7 +1004,7 @@ class PackageDocumentAction(DoxygenAction):
 \r
         try:\r
             file = open(path, 'rb')\r
-        except (IOError, OSError), msg:\r
+        except (IOError, OSError) as msg:\r
             return None\r
 \r
         t = file.read()\r

diff --git a/BaseTools/Scripts/UpdateBuildVersions.py b/BaseTools/Scripts/UpdateBuildVersions.py
index e62030aa9f0fc8d9602f8aaff3a88755ff4509cc..fb61b89bfb4c55c9012160e56f0509abf0bae35e 100755 (executable)
--- a/BaseTools/Scripts/UpdateBuildVersions.py
+++ b/BaseTools/Scripts/UpdateBuildVersions.py
@@ -90,7 +90,8 @@ def ShellCommandResults(CmdLine, Opt):
             sys.stderr.flush()\r
         returnValue = err_val.returncode\r
 \r
-    except IOError as (errno, strerror):\r
+    except IOError as err_val:\r
+        (errno, strerror) = err_val.args\r
         file_list.close()\r
         if not Opt.silent:\r
             sys.stderr.write("I/O ERROR : %s : %s\n" % (str(errno), strerror))\r
@@ -100,7 +101,8 @@ def ShellCommandResults(CmdLine, Opt):
             sys.stderr.flush()\r
         returnValue = errno\r
 \r
-    except OSError as (errno, strerror):\r
+    except OSError as err_val:\r
+        (errno, strerror) = err_val.args\r
         file_list.close()\r
         if not Opt.silent:\r
             sys.stderr.write("OS ERROR : %s : %s\n" % (str(errno), strerror))\r
@@ -210,13 +212,15 @@ def RevertCmd(Filename, Opt):
             sys.stderr.write("Subprocess ERROR : %s\n" % err_val)\r
             sys.stderr.flush()\r
 \r
-    except IOError as (errno, strerror):\r
+    except IOError as err_val:\r
+        (errno, strerror) = err_val.args\r
         if not Opt.silent:\r
             sys.stderr.write("I/O ERROR : %d : %s\n" % (str(errno), strerror))\r
             sys.stderr.write("ERROR : this command failed : %s\n" % CmdLine)\r
             sys.stderr.flush()\r
 \r
-    except OSError as (errno, strerror):\r
+    except OSError as err_val:\r
+        (errno, strerror) = err_val.args\r
         if not Opt.silent:\r
             sys.stderr.write("OS ERROR : %d : %s\n" % (str(errno), strerror))\r
             sys.stderr.write("ERROR : this command failed : %s\n" % CmdLine)\r

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index ed0be3bc74f925bfa9072ddf3a52d2b96586d7c0..72d801df8fd5d1bfd03835298e9b475f5b085f8d 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -2220,7 +2220,7 @@ class PlatformAutoGen(AutoGen):
             if ToPcd.DefaultValue:\r
                 try:\r
                     ToPcd.DefaultValue = ValueExpressionEx(ToPcd.DefaultValue, ToPcd.DatumType, self._GuidDict)(True)\r
-                except BadExpression, Value:\r
+                except BadExpression as Value:\r
                     EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(ToPcd.TokenSpaceGuidCName, ToPcd.TokenCName, ToPcd.DefaultValue, Value),\r
                                         File=self.MetaFile)\r
 \r

diff --git a/BaseTools/Source/Python/AutoGen/GenDepex.py b/BaseTools/Source/Python/AutoGen/GenDepex.py
index ed5df2b75440172ac6253a6e5aa18fccbeeb025d..b69788c37e08ab2b06e9f733c336361efbc073af 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenDepex.py
+++ b/BaseTools/Source/Python/AutoGen/GenDepex.py
@@ -449,7 +449,7 @@ def Main():
                     os.utime(Option.OutputFile, None)\r
         else:\r
             Dpx.Generate()\r
-    except BaseException, X:\r
+    except BaseException as X:\r
         EdkLogger.quiet("")\r
         if Option is not None and Option.debug is not None:\r
             EdkLogger.quiet(traceback.format_exc())\r

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 8541372159a27acce00ee78631f5847e64eb9520..48b66c570e0a86d6ae0612f799e97aca7792639e 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -1030,7 +1030,7 @@ cleanlib:
             else:\r
                 try:\r
                     Fd = open(F.Path, 'r')\r
-                except BaseException, X:\r
+                except BaseException as X:\r
                     EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F.Path + "\n\t" + str(X))\r
 \r
                 FileContent = Fd.read()\r

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 5a3c2547783b3ff38b4bb41c8536672ae93beb3c..06cf3e7d5162b694f38f0a30c295706f19e05534 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -254,7 +254,7 @@ class UniFileClassObject(object):
         if len(Lang) != 3:\r
             try:\r
                 FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
-            except UnicodeError, X:\r
+            except UnicodeError as X:\r
                 EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File);\r
             except:\r
                 EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File);\r
@@ -393,7 +393,7 @@ class UniFileClassObject(object):
 \r
         try:\r
             FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
-        except UnicodeError, X:\r
+        except UnicodeError as X:\r
             EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File.Path);\r
         except:\r
             EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File.Path);\r

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 9e9d9fdc02e7e075e56468d8eac31226e6fd1946..7b04dcdb36ccf4172a018dff37d8baccbaeef43b 100644 (file)
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -307,7 +307,7 @@ class ValueExpression(BaseExpression):
         }\r
         try:\r
             Val = eval(EvalStr, {}, Dict)\r
-        except Exception, Excpt:\r
+        except Exception as Excpt:\r
             raise BadExpression(str(Excpt))\r
 \r
         if Operator in {'and', 'or'}:\r
@@ -425,7 +425,7 @@ class ValueExpression(BaseExpression):
                 continue\r
             try:\r
                 Val = self.Eval(Op, Val, EvalFunc())\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 Val = Warn.result\r
         return Val\r
@@ -464,7 +464,7 @@ class ValueExpression(BaseExpression):
                 Op += ' ' + self._Token\r
             try:\r
                 Val = self.Eval(Op, Val, self._RelExpr())\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 Val = Warn.result\r
         return Val\r
@@ -490,14 +490,14 @@ class ValueExpression(BaseExpression):
             Val = self._UnaryExpr()\r
             try:\r
                 return self.Eval('not', Val)\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 return Warn.result\r
         if self._IsOperator({"~"}):\r
             Val = self._UnaryExpr()\r
             try:\r
                 return self.Eval('~', Val)\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 return Warn.result\r
         return self._IdenExpr()\r
@@ -816,9 +816,9 @@ class ValueExpressionEx(ValueExpression):
             elif self.PcdType in TAB_PCD_NUMERIC_TYPES and (PcdValue.startswith("'") or \\r
                       PcdValue.startswith('"') or PcdValue.startswith("L'") or PcdValue.startswith('L"') or PcdValue.startswith('{')):\r
                 raise BadExpression\r
-        except WrnExpression, Value:\r
+        except WrnExpression as Value:\r
             PcdValue = Value.result\r
-        except BadExpression, Value:\r
+        except BadExpression as Value:\r
             if self.PcdType in TAB_PCD_NUMERIC_TYPES:\r
                 PcdValue = PcdValue.strip()\r
                 if PcdValue.startswith('{') and PcdValue.endswith('}'):\r
@@ -854,7 +854,7 @@ class ValueExpressionEx(ValueExpression):
                                 tmpValue = int(Item, 0)\r
                                 if tmpValue > 255:\r
                                     raise BadExpression("Byte  array number %s should less than 0xFF." % Item)\r
-                            except BadExpression, Value:\r
+                            except BadExpression as Value:\r
                                 raise BadExpression(Value)\r
                             except ValueError:\r
                                 pass\r
@@ -870,7 +870,7 @@ class ValueExpressionEx(ValueExpression):
                 else:\r
                     try:\r
                         TmpValue, Size = ParseFieldValue(PcdValue)\r
-                    except BadExpression, Value:\r
+                    except BadExpression as Value:\r
                         raise BadExpression("Type: %s, Value: %s, %s" % (self.PcdType, PcdValue, Value))\r
                 if type(TmpValue) == type(''):\r
                     try:\r
@@ -1030,8 +1030,8 @@ if __name__ == '__main__':
         try:\r
             print ValueExpression(input)(True)\r
             print ValueExpression(input)(False)\r
-        except WrnExpression, Ex:\r
+        except WrnExpression as Ex:\r
             print Ex.result\r
             print str(Ex)\r
-        except Exception, Ex:\r
+        except Exception as Ex:\r
             print str(Ex)\r

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 24706ebe500fc437ce3ed8e9b63feceacebda09f..5197818d3f27e80995bc7c9234ad08486974b943 100644 (file)
--- 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")\r
             Fd.write(Content)\r
             Fd.close()\r
-    except IOError, X:\r
+    except IOError as X:\r
         EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X)\r
 \r
     return True\r
@@ -512,7 +512,7 @@ def DataRestore(File):
     try:\r
         Fd = open(File, 'rb')\r
         Data = cPickle.load(Fd)\r
-    except Exception, e:\r
+    except Exception as e:\r
         EdkLogger.verbose("Failed to load [%s]\n\t%s" % (File, str(e)))\r
         Data = None\r
     finally:\r
@@ -1278,7 +1278,7 @@ def ParseDevPathValue (Value):
     try:\r
         p = subprocess.Popen(Cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
         out, err = p.communicate()\r
-    except Exception, X:\r
+    except Exception as X:\r
         raise BadExpression("DevicePath: %s" % (str(X)) )\r
     finally:\r
         subprocess._cleanup()\r
@@ -1327,7 +1327,7 @@ def ParseFieldValue (Value):
             Value = Value[1:-1]\r
         try:\r
             Value = "'" + uuid.UUID(Value).get_bytes_le() + "'"\r
-        except ValueError, Message:\r
+        except ValueError as Message:\r
             raise BadExpression(Message)\r
         Value, Size = ParseFieldValue(Value)\r
         return Value, 16\r

diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index 7f504d6e310c0abe2299a5315b596bdc85dd1b1c..b6f99447057c411e632ac33513c9bfa5742d1553 100644 (file)
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -422,7 +422,7 @@ class RangeExpression(BaseExpression):
             Op = self._Token\r
             try:\r
                 Val = self.Eval(Op, Val, EvalFunc())\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 Val = Warn.result\r
         return Val\r
@@ -445,7 +445,7 @@ class RangeExpression(BaseExpression):
                 Op += ' ' + self._Token\r
             try:\r
                 Val = self.Eval(Op, Val, self._RelExpr())\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 Val = Warn.result\r
         return Val\r
@@ -457,7 +457,7 @@ class RangeExpression(BaseExpression):
             Val = self._NeExpr()\r
             try:\r
                 return self.Eval(Token, Val)\r
-            except WrnExpression, Warn:\r
+            except WrnExpression as Warn:\r
                 self._WarnExcept = Warn\r
                 return Warn.result\r
         return self._IdenExpr()\r

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 2b447772eafea79c41936c9a4977cfe516156c71..8ff544ed769d580aa25f7ee4e45a395917494ef3 100644 (file)
--- 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, \r
                                         stderr= subprocess.PIPE,\r
                                         shell=True)\r
-    except Exception, X:\r
+    except Exception as X:\r
         EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, ExtraData=str(X))\r
     (out, error) = PopenObject.communicate()\r
     print out\r

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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -532,7 +532,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -809,7 +809,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -964,7 +964,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1216,7 +1216,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1263,7 +1263,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1432,7 +1432,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1465,7 +1465,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1636,7 +1636,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1699,7 +1699,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1742,7 +1742,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1861,7 +1861,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1921,7 +1921,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2003,7 +2003,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2223,7 +2223,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2275,7 +2275,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2322,7 +2322,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3056,7 +3056,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3206,7 +3206,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3462,7 +3462,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3528,7 +3528,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3617,7 +3617,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3825,7 +3825,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3881,7 +3881,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3971,7 +3971,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4219,7 +4219,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4570,7 +4570,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4690,7 +4690,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4770,7 +4770,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4835,7 +4835,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5012,7 +5012,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5103,7 +5103,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5203,7 +5203,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5355,7 +5355,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5583,7 +5583,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5644,7 +5644,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5691,7 +5691,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5995,7 +5995,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -6100,7 +6100,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8135,7 +8135,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8170,7 +8170,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8217,7 +8217,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8285,7 +8285,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8415,7 +8415,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8475,7 +8475,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8535,7 +8535,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8595,7 +8595,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8669,7 +8669,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8743,7 +8743,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8817,7 +8817,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9058,7 +9058,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9155,7 +9155,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9228,7 +9228,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9301,7 +9301,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -12467,7 +12467,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -12560,7 +12560,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16251,7 +16251,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16435,7 +16435,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16586,7 +16586,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16703,7 +16703,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaDataTable.py
index 760f88cc72942e6a2bd733419882d4c5ccfc51a2..fc65e9a2bd3c0e9aa182d8998ffea954fea29407 100644 (file)
--- 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\r
         try:\r
             self.Cur.execute(SqlCommand)\r
-        except Exception, e:\r
+        except Exception as e:\r
             print "An error occurred when Drop a table:", e.args[0]\r
 \r
     ## Get count\r

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index 3749f6a2699e415ffed2063b826d2d9e0048e9e8..fd96bb9a3c0b7319639c318659f90c0542c01550 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -1183,7 +1183,7 @@ class DscParser(MetaFileParser):
 \r
             try:\r
                 Processer[self._ItemType]()\r
-            except EvaluationException, Excpt:\r
+            except EvaluationException as Excpt:\r
                 # \r
                 # Only catch expression evaluation error here. We need to report\r
                 # the precise number of line on which the error occurred\r
@@ -1192,7 +1192,7 @@ class DscParser(MetaFileParser):
 #                 EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt),\r
 #                                 File=self._FileWithError, ExtraData=' '.join(self._ValueList),\r
 #                                 Line=self._LineIndex+1)\r
-            except MacroException, Excpt:\r
+            except MacroException as Excpt:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt),\r
                                 File=self._FileWithError, ExtraData=' '.join(self._ValueList), \r
                                 Line=self._LineIndex+1)\r
@@ -1305,10 +1305,10 @@ class DscParser(MetaFileParser):
             Macros.update(GlobalData.gGlobalDefines)\r
             try:\r
                 Result = ValueExpression(self._ValueList[1], Macros)()\r
-            except SymbolNotFound, Exc:\r
+            except SymbolNotFound as Exc:\r
                 EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1])\r
                 Result = False\r
-            except WrnExpression, Excpt:\r
+            except WrnExpression as Excpt:\r
                 # \r
                 # Catch expression evaluation warning here. We need to report\r
                 # the precise number of line and return the evaluation result\r
@@ -1317,7 +1317,7 @@ class DscParser(MetaFileParser):
                                 File=self._FileWithError, ExtraData=' '.join(self._ValueList), \r
                                 Line=self._LineIndex+1)\r
                 Result = Excpt.result\r
-            except BadExpression, Exc:\r
+            except BadExpression as Exc:\r
                 EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1])\r
                 Result = False\r
 \r
@@ -1437,13 +1437,13 @@ class DscParser(MetaFileParser):
             PcdValue = ValueList[0]      \r
             try:\r
                 ValueList[0] = ValueExpression(PcdValue, self._Macros)(True)\r
-            except WrnExpression, Value:\r
+            except WrnExpression as Value:\r
                 ValueList[0] = Value.result          \r
         else:\r
             PcdValue = ValueList[-1]\r
             try:\r
                 ValueList[-1] = ValueExpression(PcdValue, self._Macros)(True)\r
-            except WrnExpression, Value:\r
+            except WrnExpression as Value:\r
                 ValueList[-1] = Value.result\r
             \r
             if ValueList[-1] == 'True':\r

diff --git a/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py b/BaseTools/Source/Python/Ecc/Xml/XmlRoutines.py
index a86f19624c445fb4753432d571b7b7571b76d313..d5fb80fcf98214bb57e19eaf5d552456a82a8568 100644 (file)
--- 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)\r
         XmlFile.close()\r
         return Dom\r
-    except Exception, X:\r
+    except Exception as X:\r
         print X\r
         return ""\r
 \r

diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py
index 93ee1990ba283cb26d3902a25917159d67078963..99b22725e6bacb788653eae2cabd397613f60458 100644 (file)
--- 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])\r
     try:\r
         test_file = sys.argv[1]\r
-    except IndexError, v:\r
+    except IndexError as v:\r
         print "Usage: %s filename" % sys.argv[0]\r
         sys.exit(1)\r
     MsgList = CheckFuncHeaderDoxygenComments(test_file)\r

diff --git a/BaseTools/Source/Python/Eot/CParser.py b/BaseTools/Source/Python/Eot/CParser.py
index 94711a9a378ad9ab8177798b84ffdeb487847a32..ddc6cbd506aa637ac87beb018339d77743c78bc9 100644 (file)
--- a/BaseTools/Source/Python/Eot/CParser.py
+++ b/BaseTools/Source/Python/Eot/CParser.py
@@ -173,7 +173,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -532,7 +532,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -809,7 +809,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -964,7 +964,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1216,7 +1216,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1263,7 +1263,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1432,7 +1432,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1465,7 +1465,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1636,7 +1636,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1699,7 +1699,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1742,7 +1742,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1861,7 +1861,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1921,7 +1921,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2003,7 +2003,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2223,7 +2223,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2275,7 +2275,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2322,7 +2322,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3056,7 +3056,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3206,7 +3206,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3462,7 +3462,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3528,7 +3528,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3617,7 +3617,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3825,7 +3825,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3881,7 +3881,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3971,7 +3971,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4219,7 +4219,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4570,7 +4570,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4690,7 +4690,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4770,7 +4770,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4835,7 +4835,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5012,7 +5012,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5103,7 +5103,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5203,7 +5203,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5355,7 +5355,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5583,7 +5583,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5644,7 +5644,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5691,7 +5691,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5995,7 +5995,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -6100,7 +6100,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8135,7 +8135,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8170,7 +8170,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8217,7 +8217,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8285,7 +8285,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8415,7 +8415,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8475,7 +8475,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8535,7 +8535,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8595,7 +8595,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8669,7 +8669,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8743,7 +8743,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8817,7 +8817,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9058,7 +9058,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9155,7 +9155,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9228,7 +9228,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9301,7 +9301,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -12467,7 +12467,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -12560,7 +12560,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16251,7 +16251,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\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
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16435,7 +16435,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16586,7 +16586,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16703,7 +16703,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index ceedcf8a28b94e01e750042cdfacd685bb3b5589..a99a5e7ac6938e8452899108a0c5e624998a67a4 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -921,7 +921,7 @@ class FdfParser:
                     return ValueExpression(Expression, MacroPcdDict)(True)\r
                 else:\r
                     return ValueExpression(Expression, MacroPcdDict)()\r
-            except WrnExpression, Excpt:\r
+            except WrnExpression as Excpt:\r
                 # \r
                 # Catch expression evaluation warning here. We need to report\r
                 # the precise number of line and return the evaluation result\r
@@ -930,7 +930,7 @@ class FdfParser:
                                 File=self.FileName, ExtraData=self.__CurrentLine(), \r
                                 Line=Line)\r
                 return Excpt.result\r
-            except Exception, Excpt:\r
+            except Exception as Excpt:\r
                 if hasattr(Excpt, 'Pcd'):\r
                     if Excpt.Pcd in GlobalData.gPlatformOtherPcds:\r
                         Info = GlobalData.gPlatformOtherPcds[Excpt.Pcd]\r
@@ -1368,7 +1368,7 @@ class FdfParser:
             while self.__GetFd() or self.__GetFv() or self.__GetFmp() or self.__GetCapsule() or self.__GetVtf() or self.__GetRule() or self.__GetOptionRom():\r
                 pass\r
 \r
-        except Warning, X:\r
+        except Warning as X:\r
             self.__UndoToken()\r
             #'\n\tGot Token: \"%s\" from File %s\n' % (self.__Token, FileLineTuple[0]) + \\r
             # At this point, the closest parent would be the included file itself\r
@@ -4776,7 +4776,7 @@ if __name__ == "__main__":
     import sys\r
     try:\r
         test_file = sys.argv[1]\r
-    except IndexError, v:\r
+    except IndexError as v:\r
         print "Usage: %s filename" % sys.argv[0]\r
         sys.exit(1)\r
 \r
@@ -4784,7 +4784,7 @@ if __name__ == "__main__":
     try:\r
         parser.ParseFile()\r
         parser.CycleReferenceCheck()\r
-    except Warning, X:\r
+    except Warning as X:\r
         print str(X)\r
     else:\r
         print "Success!"\r

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 339b9986736907b52fa9c7b297f6da2642c01bb2..ba3950dacd8a3d141e42cf27901efaf5eecb60fc 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -335,10 +335,10 @@ def main():
         """Display FV space info."""\r
         GenFds.DisplayFvSpaceInfo(FdfParserObj)\r
 \r
-    except FdfParser.Warning, X:\r
+    except FdfParser.Warning as X:\r
         EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError=False)\r
         ReturnCode = FORMAT_INVALID\r
-    except FatalError, X:\r
+    except FatalError as X:\r
         if Options.debug is not None:\r
             import traceback\r
             EdkLogger.quiet(traceback.format_exc())\r

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index c2e82de891d3594cc08cfbcd769f476200455762..c1d656227609c3e6210b74c4758908a1a8cef144 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -721,7 +721,7 @@ class GenFdsGlobalVariable:
 \r
         try:\r
             PopenObject = subprocess.Popen(' '.join(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
-        except Exception, X:\r
+        except Exception as X:\r
             EdkLogger.error("GenFds", COMMAND_FAILURE, ExtraData="%s: %s" % (str(X), cmd[0]))\r
         (out, error) = PopenObject.communicate()\r
 \r

diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/Source/Python/TargetTool/TargetTool.py
index ecac316b7a3adb6451b8e42d5378bf4cd4995b7e..9fb89549cc29fed836f7585520327dedaf337542 100644 (file)
--- a/BaseTools/Source/Python/TargetTool/TargetTool.py
+++ b/BaseTools/Source/Python/TargetTool/TargetTool.py
@@ -253,7 +253,7 @@ if __name__ == '__main__':
             FileHandle.RWFile('#', '=', 0)\r
         else:\r
             FileHandle.RWFile('#', '=', 1)\r
-    except Exception, e:\r
+    except Exception as e:\r
         last_type, last_value, last_tb = sys.exc_info()\r
         traceback.print_exception(last_type, last_value, last_tb)\r
 \r

diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py
index a74075859148d91c8f7a744ec7f2566fb2342961..b512d15243f83225457b2dc099ac0c026142a5ed 100644 (file)
--- a/BaseTools/Source/Python/Trim/Trim.py
+++ b/BaseTools/Source/Python/Trim/Trim.py
@@ -668,7 +668,7 @@ def Main():
             EdkLogger.SetLevel(CommandOptions.LogLevel + 1)\r
         else:\r
             EdkLogger.SetLevel(CommandOptions.LogLevel)\r
-    except FatalError, X:\r
+    except FatalError as X:\r
         return 1\r
     \r
     try:\r
@@ -688,7 +688,7 @@ def Main():
             if CommandOptions.OutputFile is None:\r
                 CommandOptions.OutputFile = os.path.splitext(InputFile)[0] + '.iii'\r
             TrimPreprocessedFile(InputFile, CommandOptions.OutputFile, CommandOptions.ConvertHex, CommandOptions.TrimLong)\r
-    except FatalError, X:\r
+    except FatalError as X:\r
         import platform\r
         import traceback\r
         if CommandOptions is not None and CommandOptions.LogLevel <= EdkLogger.DEBUG_9:\r

diff --git a/BaseTools/Source/Python/UPT/Core/DependencyRules.py b/BaseTools/Source/Python/UPT/Core/DependencyRules.py
index 2af847ed2e0bbcfaa28d59aa83891608ad24d423..34f56e7bb487b9e719f0a303c7af7e4ea89f0dc1 100644 (file)
--- a/BaseTools/Source/Python/UPT/Core/DependencyRules.py
+++ b/BaseTools/Source/Python/UPT/Core/DependencyRules.py
@@ -394,7 +394,7 @@ def VerifyRemoveModuleDep(Path, DpPackagePathList):
                 return False\r
         else:\r
             return True\r
-    except FatalError, ErrCode:\r
+    except FatalError as ErrCode:\r
         if ErrCode.message == EDK1_INF_ERROR:\r
             Logger.Warn("UPT",\r
                         ST.WRN_EDK1_INF_FOUND%Path)\r
@@ -446,7 +446,7 @@ def VerifyReplaceModuleDep(Path, DpPackagePathList, OtherPkgList):
                     return False\r
         else:\r
             return True\r
-    except FatalError, ErrCode:\r
+    except FatalError as ErrCode:\r
         if ErrCode.message == EDK1_INF_ERROR:\r
             Logger.Warn("UPT",\r
                         ST.WRN_EDK1_INF_FOUND%Path)\r

diff --git a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
index 9c55e0ea88a717168dd710b342db524383bd712c..81c67fb510a28014981c2647020262f9f4b17247 100644 (file)
--- a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
+++ b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
@@ -155,7 +155,7 @@ class DistributionPackageClass(object):
                                     ModuleObj.GetName(), \\r
                                     ModuleObj.GetCombinePath())] = ModuleObj\r
                         PackageObj.SetModuleDict(ModuleDict)\r
-                    except FatalError, ErrCode:\r
+                    except FatalError as ErrCode:\r
                         if ErrCode.message == EDK1_INF_ERROR:\r
                             Logger.Warn("UPT",\r
                                         ST.WRN_EDK1_INF_FOUND%Filename)\r
@@ -181,7 +181,7 @@ class DistributionPackageClass(object):
                                  ModuleObj.GetName(), \r
                                  ModuleObj.GetCombinePath())\r
                     self.ModuleSurfaceArea[ModuleKey] = ModuleObj\r
-                except FatalError, ErrCode:\r
+                except FatalError as ErrCode:\r
                     if ErrCode.message == EDK1_INF_ERROR:\r
                         Logger.Error("UPT",\r
                                      EDK1_INF_ERROR,\r

diff --git a/BaseTools/Source/Python/UPT/Core/IpiDb.py b/BaseTools/Source/Python/UPT/Core/IpiDb.py
index 78d67ab31e1eaba543cb9ee1f6199b07fab9283e..97ad47a58dbb00307af03e275958d5a412e527e1 100644 (file)
--- a/BaseTools/Source/Python/UPT/Core/IpiDb.py
+++ b/BaseTools/Source/Python/UPT/Core/IpiDb.py
@@ -230,7 +230,7 @@ class IpiDatabase(object):
             self._AddDp(DpObj.Header.GetGuid(), DpObj.Header.GetVersion(), \\r
                         NewDpPkgFileName, DpPkgFileName, RePackage)\r
     \r
-        except sqlite3.IntegrityError, DetailMsg:\r
+        except sqlite3.IntegrityError as DetailMsg:\r
             Logger.Error("UPT",\r
                          UPT_DB_UPDATE_ERROR,\r
                          ST.ERR_UPT_DB_UPDATE_ERROR,\r

diff --git a/BaseTools/Source/Python/UPT/Core/PackageFile.py b/BaseTools/Source/Python/UPT/Core/PackageFile.py
index ec6f5503eaad39756894c329f87432e763d17475..298d8aa9db3b543feddf6f3d74345bae24990990 100644 (file)
--- a/BaseTools/Source/Python/UPT/Core/PackageFile.py
+++ b/BaseTools/Source/Python/UPT/Core/PackageFile.py
@@ -51,7 +51,7 @@ class PackageFile:
             self._Files = {}\r
             for Filename in self._ZipFile.namelist():\r
                 self._Files[os.path.normpath(Filename)] = Filename\r
-        except BaseException, Xstr:\r
+        except BaseException as Xstr:\r
             Logger.Error("PackagingTool", FILE_OPEN_FAILURE, \r
                             ExtraData="%s (%s)" % (FileName, str(Xstr)))\r
 \r
@@ -106,7 +106,7 @@ class PackageFile:
                             ExtraData="[%s] in %s" % (Which, self._FileName))\r
         try:\r
             FileContent = self._ZipFile.read(self._Files[Which])\r
-        except BaseException, Xstr:\r
+        except BaseException as Xstr:\r
             Logger.Error("PackagingTool", FILE_DECOMPRESS_FAILURE, \r
                             ExtraData="[%s] in %s (%s)" % (Which, \\r
                                                            self._FileName, \\r
@@ -119,14 +119,14 @@ class PackageFile:
                 return\r
             else:\r
                 ToFile = __FileHookOpen__(ToDest, 'wb')\r
-        except BaseException, Xstr:\r
+        except BaseException as Xstr:\r
             Logger.Error("PackagingTool", FILE_OPEN_FAILURE, \r
                             ExtraData="%s (%s)" % (ToDest, str(Xstr)))\r
 \r
         try:\r
             ToFile.write(FileContent)\r
             ToFile.close()\r
-        except BaseException, Xstr:\r
+        except BaseException as Xstr:\r
             Logger.Error("PackagingTool", FILE_WRITE_FAILURE, \r
                             ExtraData="%s (%s)" % (ToDest, str(Xstr)))\r
 \r
@@ -228,7 +228,7 @@ class PackageFile:
                     return\r
             Logger.Info("packing ..." + File)\r
             self._ZipFile.write(File, ArcName)\r
-        except BaseException, Xstr:\r
+        except BaseException as Xstr:\r
             Logger.Error("PackagingTool", FILE_COMPRESS_FAILURE,\r
                             ExtraData="%s (%s)" % (File, str(Xstr)))\r
 \r
@@ -242,7 +242,7 @@ class PackageFile:
             if os.path.splitext(ArcName)[1].lower() == '.pkg':\r
                 Data = Data.encode('utf_8')\r
             self._ZipFile.writestr(ArcName, Data)\r
-        except BaseException, Xstr:\r
+        except BaseException as Xstr:\r
             Logger.Error("PackagingTool", FILE_COMPRESS_FAILURE,\r
                             ExtraData="%s (%s)" % (ArcName, str(Xstr)))\r
 \r

diff --git a/BaseTools/Source/Python/UPT/InstallPkg.py b/BaseTools/Source/Python/UPT/InstallPkg.py
index c0d56b55aacde53df33d0ea1c6add11317aac3a2..dc22ff7e348438821677e5e8ea5b34687cfb9b64 100644 (file)
--- a/BaseTools/Source/Python/UPT/InstallPkg.py
+++ b/BaseTools/Source/Python/UPT/InstallPkg.py
@@ -537,7 +537,7 @@ def Main(Options = None):
                       Options, Dep, WorkspaceDir, DataBase)\r
         ReturnCode = 0\r
         \r
-    except FatalError, XExcept:\r
+    except FatalError as XExcept:\r
         ReturnCode = XExcept.args[0]\r
         if Logger.GetLevel() <= Logger.DEBUG_9:\r
             Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc())\r

diff --git a/BaseTools/Source/Python/UPT/InventoryWs.py b/BaseTools/Source/Python/UPT/InventoryWs.py
index 824e1c288947d2e96b146adff9aed116b65b77a8..cd92753a8d4b4849eb816d8a0812449ee384ffc3 100644 (file)
--- a/BaseTools/Source/Python/UPT/InventoryWs.py
+++ b/BaseTools/Source/Python/UPT/InventoryWs.py
@@ -92,7 +92,7 @@ def Main(Options = None):
         DataBase = GlobalData.gDB\r
         InventoryDistInstalled(DataBase)     \r
         ReturnCode = 0       \r
-    except FatalError, XExcept:\r
+    except FatalError as XExcept:\r
         ReturnCode = XExcept.args[0]\r
         if Logger.GetLevel() <= Logger.DEBUG_9:\r
             Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc())\r

diff --git a/BaseTools/Source/Python/UPT/Library/CommentParsing.py b/BaseTools/Source/Python/UPT/Library/CommentParsing.py
index 4713614c4a45dd85e8905481d3fb7c9735b5c8c8..8ee788bd7724e097efb0fbfea980a4ef997bb4c2 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/CommentParsing.py
+++ b/BaseTools/Source/Python/UPT/Library/CommentParsing.py
@@ -217,7 +217,7 @@ def ParsePcdErrorCode (Value = None, ContainerFile = None, LineNum = None):
         # To delete the tailing 'L'\r
         #\r
         return hex(ErrorCode)[:-1]\r
-    except ValueError, XStr:\r
+    except ValueError as XStr:\r
         if XStr:\r
             pass\r
         Logger.Error('Parser', \r

diff --git a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py b/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py
index 090c7eb95716fa223bd791f07605568a2ebe8625..ca21e6995217485303d956978529c47176b1e784 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py
+++ b/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py
@@ -297,7 +297,7 @@ class _LogicalExpressionParser(_ExprBase):
         try:\r
             if self.LogicalExpression() not in [self.ARITH, self.LOGICAL, self.REALLOGICAL, self.STRINGITEM]:\r
                 return False, ST.ERR_EXPR_LOGICAL % self.Token\r
-        except _ExprError, XExcept:\r
+        except _ExprError as XExcept:\r
             return False, XExcept.Error\r
         self.SkipWhitespace()\r
         if self.Index != self.Len:\r
@@ -327,7 +327,7 @@ class _ValidRangeExpressionParser(_ExprBase):
         try:\r
             if self.RangeExpression() not in [self.HEX, self.INT]:\r
                 return False, ST.ERR_EXPR_RANGE % self.Token\r
-        except _ExprError, XExcept:\r
+        except _ExprError as XExcept:\r
             return False, XExcept.Error\r
         \r
         self.SkipWhitespace()\r
@@ -423,7 +423,7 @@ class _ValidListExpressionParser(_ExprBase):
         try:\r
             if self.ListExpression() not in [self.NUM]:\r
                 return False, ST.ERR_EXPR_LIST % self.Token\r
-        except _ExprError, XExcept:\r
+        except _ExprError as XExcept:\r
             return False, XExcept.Error\r
 \r
         self.SkipWhitespace()\r
@@ -457,7 +457,7 @@ class _StringTestParser(_ExprBase):
             return False, ST.ERR_EXPR_EMPTY\r
         try:\r
             self.StringTest()\r
-        except _ExprError, XExcept:\r
+        except _ExprError as XExcept:\r
             return False, XExcept.Error\r
         return True, ''\r
 \r

diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
index 7dcf0cf6558b84717f543216163f317d39fb6ea3..299cd871444b0614b4d30e74841e8bb70496d246 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py
+++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
@@ -327,9 +327,9 @@ class UniFileClassObject(object):
         if len(Lang) != 3:\r
             try:\r
                 FileIn = codecs.open(File.Path, mode='rb', encoding='utf_8').readlines()\r
-            except UnicodeError, Xstr:\r
+            except UnicodeError as Xstr:\r
                 FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').readlines()\r
-            except UnicodeError, Xstr:\r
+            except UnicodeError as Xstr:\r
                 FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines()\r
             except:\r
                 EdkLogger.Error("Unicode File Parser", \r
@@ -436,7 +436,7 @@ class UniFileClassObject(object):
 \r
         try:\r
             FileIn = codecs.open(File.Path, mode='rb', encoding='utf_8').readlines()\r
-        except UnicodeError, Xstr:\r
+        except UnicodeError as Xstr:\r
             FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16').readlines()\r
         except UnicodeError:\r
             FileIn = codecs.open(File.Path, mode='rb', encoding='utf_16_le').readlines()\r
@@ -1042,7 +1042,7 @@ class UniFileClassObject(object):
                              ExtraData=FilaPath)\r
         try:\r
             FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_8').readlines()\r
-        except UnicodeError, Xstr:\r
+        except UnicodeError as Xstr:\r
             FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16').readlines()\r
         except UnicodeError:\r
             FileIn = codecs.open(FilaPath, mode='rb', encoding='utf_16_le').readlines()\r

diff --git a/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py b/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py
index f20ae4dfa82f24acba91f1f3de06c899aa358aea..1096bc5b18498c99ce37f24a22242932d8843df1 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py
+++ b/BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py
@@ -224,6 +224,6 @@ def XmlParseFile(FileName):
         Dom = xml.dom.minidom.parse(XmlFile)\r
         XmlFile.close()\r
         return Dom\r
-    except BaseException, XExcept:\r
+    except BaseException as XExcept:\r
         XmlFile.close()\r
         Logger.Error('\nUPT', PARSER_ERROR, XExcept, File=FileName, RaiseError=True)\r

diff --git a/BaseTools/Source/Python/UPT/MkPkg.py b/BaseTools/Source/Python/UPT/MkPkg.py
index ff9aa7fb117c8d5bc4fdb89cec478dc43311b060..e7ec328a78d9be0830c51fcd4bebd087c2dd7bfb 100644 (file)
--- a/BaseTools/Source/Python/UPT/MkPkg.py
+++ b/BaseTools/Source/Python/UPT/MkPkg.py
@@ -213,7 +213,7 @@ def Main(Options = None):
         Logger.Quiet(ST.MSG_FINISH)\r
         ReturnCode = 0\r
 \r
-    except FatalError, XExcept:\r
+    except FatalError as XExcept:\r
         ReturnCode = XExcept.args[0]        \r
         if Logger.GetLevel() <= Logger.DEBUG_9:\r
             Logger.Quiet(ST.MSG_PYTHON_ON % \\r

diff --git a/BaseTools/Source/Python/UPT/ReplacePkg.py b/BaseTools/Source/Python/UPT/ReplacePkg.py
index efbf68a4ecc638a6b350d1c5268be9dfd672fe27..6f52b4f8f8e865605f9e04b0ca1415f449a004df 100644 (file)
--- a/BaseTools/Source/Python/UPT/ReplacePkg.py
+++ b/BaseTools/Source/Python/UPT/ReplacePkg.py
@@ -71,7 +71,7 @@ def Main(Options = None):
         InstallDp(DistPkg, DpPkgFileName, ContentZipFile, Options, Dep, WorkspaceDir, DataBase)\r
         ReturnCode = 0\r
         \r
-    except FatalError, XExcept:\r
+    except FatalError as XExcept:\r
         ReturnCode = XExcept.args[0]\r
         if Logger.GetLevel() <= Logger.DEBUG_9:\r
             Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(),\r

diff --git a/BaseTools/Source/Python/UPT/RmPkg.py b/BaseTools/Source/Python/UPT/RmPkg.py
index ea842c11859fd7dcc606ea47bc7d023053e375f3..6427a8f16c887cac3ec61ac3cd2ee0cc01f39d4c 100644 (file)
--- a/BaseTools/Source/Python/UPT/RmPkg.py
+++ b/BaseTools/Source/Python/UPT/RmPkg.py
@@ -157,7 +157,7 @@ def Main(Options = None):
         \r
         ReturnCode = 0\r
         \r
-    except FatalError, XExcept:\r
+    except FatalError as XExcept:\r
         ReturnCode = XExcept.args[0]        \r
         if Logger.GetLevel() <= Logger.DEBUG_9:\r
             Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + \\r

diff --git a/BaseTools/Source/Python/UPT/TestInstall.py b/BaseTools/Source/Python/UPT/TestInstall.py
index 899cae56aa8790035e75726f4ecaabb08e936d10..d8918737f9075dc70be4ca8b88113fb7e343edd7 100644 (file)
--- a/BaseTools/Source/Python/UPT/TestInstall.py
+++ b/BaseTools/Source/Python/UPT/TestInstall.py
@@ -68,12 +68,12 @@ def Main(Options=None):
         else:\r
             Logger.Quiet(ST.MSG_TEST_INSTALL_FAIL)\r
 \r
-    except TE.FatalError, XExcept:\r
+    except TE.FatalError as XExcept:\r
         ReturnCode = XExcept.args[0]\r
         if Logger.GetLevel() <= Logger.DEBUG_9:\r
             Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc())\r
 \r
-    except Exception, x:\r
+    except Exception as x:\r
         ReturnCode = TE.CODE_ERROR\r
         Logger.Error(\r
                     "\nTestInstallPkg",\r

diff --git a/BaseTools/Source/Python/UPT/UPT.py b/BaseTools/Source/Python/UPT/UPT.py
index 09653cdce95f2c22d8aa6508f79a54659fa91450..2644dbed31e9f809f1a1449783d5689c03ea80fb 100644 (file)
--- a/BaseTools/Source/Python/UPT/UPT.py
+++ b/BaseTools/Source/Python/UPT/UPT.py
@@ -179,7 +179,7 @@ def Main():
 \r
     try:\r
         GlobalData.gWORKSPACE, GlobalData.gPACKAGE_PATH = GetWorkspace()\r
-    except FatalError, XExcept:\r
+    except FatalError as XExcept:\r
         if Logger.GetLevel() <= Logger.DEBUG_9:\r
             Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc())\r
         return XExcept.args[0]\r
@@ -294,7 +294,7 @@ def Main():
             return OPTION_MISSING\r
 \r
         ReturnCode = RunModule(Opt)\r
-    except FatalError, XExcept:\r
+    except FatalError as XExcept:\r
         ReturnCode = XExcept.args[0]\r
         if Logger.GetLevel() <= Logger.DEBUG_9:\r
             Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + \\r

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 1ed7eb1c2cf72983a1c08eb048edf6e985aeca6b..a001162e8e3b74315f90d1a837e0116b5f6d1f1a 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -120,7 +120,7 @@ def GetDependencyList(FileStack,SearchPathList):
             try:\r
                 Fd = open(F, 'r')\r
                 FileContent = Fd.read()\r
-            except BaseException, X:\r
+            except BaseException as X:\r
                 EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F + "\n\t" + str(X))\r
             finally:\r
                 if "Fd" in dir(locals()):\r
@@ -887,11 +887,11 @@ class DscBuildData(PlatformBuildClassObject):
             DatumType = self._DecPcds[PcdCName, TokenSpaceGuid].DatumType\r
             try:\r
                 ValueList[Index] = ValueExpressionEx(ValueList[Index], DatumType, self._GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, Value, File=self.MetaFile, Line=LineNo,\r
                                 ExtraData="PCD [%s.%s] Value \"%s\" " % (\r
                                 TokenSpaceGuid, PcdCName, ValueList[Index]))\r
-            except EvaluationException, Excpt:\r
+            except EvaluationException as Excpt:\r
                 if hasattr(Excpt, 'Pcd'):\r
                     if Excpt.Pcd in GlobalData.gPlatformOtherPcds:\r
                         EdkLogger.error('Parser', FORMAT_INVALID, "Cannot use this PCD (%s) in an expression as"\r
@@ -1059,7 +1059,7 @@ class DscBuildData(PlatformBuildClassObject):
                 return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue[1:], PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:     \r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         elif PcdValue.startswith("L'") or PcdValue.startswith("'"):\r
@@ -1070,7 +1070,7 @@ class DscBuildData(PlatformBuildClassObject):
                 return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue, PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         elif PcdValue.startswith('L'):\r
@@ -1082,7 +1082,7 @@ class DscBuildData(PlatformBuildClassObject):
                 return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue, PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         else:\r
@@ -1109,7 +1109,7 @@ class DscBuildData(PlatformBuildClassObject):
                     return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue, PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         return PcdValue\r

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 836140759f2181a9b88180b290e6621c5d4b3993..165e03f78964bc5e8f99350d57fe9b48a34015cf 100644 (file)
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -1121,7 +1121,7 @@ class InfBuildData(ModuleBuildClassObject):
                     else:\r
                         try:\r
                             Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, Pcd.DatumType, _GuidDict)(True)\r
-                        except BadExpression, Value:\r
+                        except BadExpression as Value:\r
                             EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(TokenSpaceGuid, PcdRealName, Pcd.DefaultValue, Value),\r
                                             File=self.MetaFile, Line=LineNo)\r
                     break\r

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 88c7bb374ccc2159fcacdaac70a45ac43f996fac..f1cfa73fd4f2a0df111b1c76bbd88f0cff8b2981 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -1341,7 +1341,7 @@ class DscParser(MetaFileParser):
                 self._InSubsection = False\r
             try:\r
                 Processer[self._ItemType]()\r
-            except EvaluationException, Excpt:\r
+            except EvaluationException as Excpt:\r
                 # \r
                 # Only catch expression evaluation error here. We need to report\r
                 # the precise number of line on which the error occurred\r
@@ -1363,7 +1363,7 @@ class DscParser(MetaFileParser):
                     EdkLogger.error('Parser', FORMAT_INVALID, "Invalid expression: %s" % str(Excpt),\r
                                     File=self._FileWithError, ExtraData=' '.join(self._ValueList),\r
                                     Line=self._LineIndex + 1)\r
-            except MacroException, Excpt:\r
+            except MacroException as Excpt:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, str(Excpt),\r
                                 File=self._FileWithError, ExtraData=' '.join(self._ValueList),\r
                                 Line=self._LineIndex + 1)\r
@@ -1465,10 +1465,10 @@ class DscParser(MetaFileParser):
             Macros.update(GlobalData.gGlobalDefines)\r
             try:\r
                 Result = ValueExpression(self._ValueList[1], Macros)()\r
-            except SymbolNotFound, Exc:\r
+            except SymbolNotFound as Exc:\r
                 EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1])\r
                 Result = False\r
-            except WrnExpression, Excpt:\r
+            except WrnExpression as Excpt:\r
                 # \r
                 # Catch expression evaluation warning here. We need to report\r
                 # the precise number of line and return the evaluation result\r
@@ -1614,7 +1614,7 @@ class DscParser(MetaFileParser):
         if PcdValue and "." not in self._ValueList[0]:\r
             try:\r
                 ValList[Index] = ValueExpression(PcdValue, self._Macros)(True)\r
-            except WrnExpression, Value:\r
+            except WrnExpression as Value:\r
                 ValList[Index] = Value.result\r
             except:\r
                 pass\r
@@ -2019,7 +2019,7 @@ class DecParser(MetaFileParser):
                 try:\r
                     self._GuidDict.update(self._AllPcdDict)\r
                     ValueList[0] = ValueExpressionEx(ValueList[0], ValueList[1], self._GuidDict)(True)\r
-                except BadExpression, Value:\r
+                except BadExpression as Value:\r
                     EdkLogger.error('Parser', FORMAT_INVALID, Value, ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
             # check format of default value against the datum type\r
             IsValid, Cause = CheckPcdDatum(ValueList[1], ValueList[0])\r

diff --git a/BaseTools/Source/Python/Workspace/MetaFileTable.py b/BaseTools/Source/Python/Workspace/MetaFileTable.py
index 3c8dae0e622faf550e8abb72a82eaa55b6e0444c..d17487a4409d7be073db15982b972c84521772e9 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileTable.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileTable.py
@@ -63,7 +63,7 @@ class MetaFileTable(Table):
                 # update the timestamp in database\r
                 self._FileIndexTable.SetFileTimeStamp(self.IdBase, TimeStamp)\r
                 return False\r
-        except Exception, Exc:\r
+        except Exception as Exc:\r
             EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc))\r
             return False\r
         return True\r
@@ -250,7 +250,7 @@ class PackageTable(MetaFileTable):
                 if comment.startswith("@Expression"):\r
                     comment = comment.replace("@Expression", "", 1)\r
                     expressions.append(comment.split("|")[1].strip())\r
-        except Exception, Exc:\r
+        except Exception as Exc:\r
             ValidType = ""\r
             if oricomment.startswith("@ValidRange"):\r
                 ValidType = "@ValidRange"\r

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 324b6ff6aa764c7e8b0571792b393ccc089180bd..55222c886d2dd7d85e25289cfbd9686f20c55545 100644 (file)
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -649,7 +649,7 @@ class ModuleReport(object):
                 cmd = ["GenFw", "--rebase", str(0), "-o", Tempfile, DefaultEFIfile]\r
                 try:\r
                     PopenObject = subprocess.Popen(' '.join(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
-                except Exception, X:\r
+                except Exception as X:\r
                     EdkLogger.error("GenFw", COMMAND_FAILURE, ExtraData="%s: %s" % (str(X), cmd[0]))\r
                 EndOfProcedure = threading.Event()\r
                 EndOfProcedure.clear()\r
@@ -962,7 +962,7 @@ class PcdReport(object):
                 if DscDefaultValue != DscDefaultValBak:\r
                     try:\r
                         DscDefaultValue = ValueExpressionEx(DscDefaultValue, Pcd.DatumType, self._GuidDict)(True)\r
-                    except BadExpression, DscDefaultValue:\r
+                    except BadExpression as DscDefaultValue:\r
                         EdkLogger.error('BuildReport', FORMAT_INVALID, "PCD Value: %s, Type: %s" %(DscDefaultValue, Pcd.DatumType))\r
 \r
                 InfDefaultValue = None\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index c16e810fed714e11b5aad1abc80f8cdb0086d5d7..4600c46be1beca44bb3ab33b55404f24904636df 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -548,7 +548,7 @@ class BuildTask:
                 EdkLogger.debug(EdkLogger.DEBUG_8, "Threads [%s]" % ", ".join(Th.getName() for Th in threading.enumerate()))\r
                 # avoid tense loop\r
                 time.sleep(0.1)\r
-        except BaseException, X:\r
+        except BaseException as X:\r
             #\r
             # TRICK: hide the output of threads left runing, so that the user can\r
             #        catch the error message easily\r
@@ -1324,7 +1324,7 @@ class Build():
             try:\r
                 #os.rmdir(AutoGenObject.BuildDir)\r
                 RemoveDirectory(AutoGenObject.BuildDir, True)\r
-            except WindowsError, X:\r
+            except WindowsError as X:\r
                 EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))\r
         return True\r
 \r
@@ -1414,7 +1414,7 @@ class Build():
             try:\r
                 #os.rmdir(AutoGenObject.BuildDir)\r
                 RemoveDirectory(AutoGenObject.BuildDir, True)\r
-            except WindowsError, X:\r
+            except WindowsError as X:\r
                 EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))\r
         return True\r
 \r
@@ -2500,14 +2500,14 @@ def Main():
         # All job done, no error found and no exception raised\r
         #\r
         BuildError = False\r
-    except FatalError, X:\r
+    except FatalError as X:\r
         if MyBuild is not None:\r
             # for multi-thread build exits safely\r
             MyBuild.Relinquish()\r
         if Option is not None and Option.debug is not None:\r
             EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r
         ReturnCode = X.args[0]\r
-    except Warning, X:\r
+    except Warning as X:\r
         # error from Fdf parser\r
         if MyBuild is not None:\r
             # for multi-thread build exits safely\r

diff --git a/BaseTools/Tests/CheckPythonSyntax.py b/BaseTools/Tests/CheckPythonSyntax.py
index 61a048ad5d054b84c2be68c08fb231cdb3cc320b..a55b29de4713ff4365c5d7a17ea0146c069f54bb 100644 (file)
--- a/BaseTools/Tests/CheckPythonSyntax.py
+++ b/BaseTools/Tests/CheckPythonSyntax.py
@@ -29,7 +29,7 @@ class Tests(TestTools.BaseToolsTest):
     def SingleFileTest(self, filename):\r
         try:\r
             py_compile.compile(filename, doraise=True)\r
-        except Exception, e:\r
+        except Exception as e:\r
             self.fail('syntax error: %s, Error is %s' % (filename, str(e)))\r
 \r
 def MakePythonSyntaxCheckTests():\r

diff --git a/BaseTools/gcc/mingw-gcc-build.py b/BaseTools/gcc/mingw-gcc-build.py
index 420b3dea80f7976fab5067bccc1ad0d5a6aa0f24..7b1076c38bb5965bda43806761ba5a63f262c2e9 100755 (executable)
--- a/BaseTools/gcc/mingw-gcc-build.py
+++ b/BaseTools/gcc/mingw-gcc-build.py
@@ -337,7 +337,7 @@ class SourceFiles:
                     print '[KeyboardInterrupt]'
                     return False
 
-                except Exception, e:
+                except Exception as e:\r
                     print e
 
             if not completed: return False