BaseTools: Refactor python except statements

Convert "except ... ," to "except ... as" to be compatible with python3.
Based on "futurize -f lib2to3.fixes.fix_except"

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

4 files changed, 12 insertions, 8 deletions

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/doxygen.py
index 488949f24b..a177590af5 100644
--- 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')

             f.write('\n'.join(str))

             f.close()

-        except IOError, e:

+        except IOError as e:

             ErrorMsg ('Fail to write file %s' % self.mFilename)

             return False

 

@@ -429,7 +429,7 @@ class DoxygenConfigFile:
             f = open(path, 'w')

             f.write(text)

             f.close()

-        except IOError, e:

+        except IOError as e:

             ErrorMsg ('Fail to generate doxygen config file %s' % path)

             return False

 

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
index 94b6588c0d..c22d362ff3 100644
--- 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):
 

         try:

             file = open(path, 'rb')

-        except (IOError, OSError), msg:

+        except (IOError, OSError) as msg:

             return None

 

         t = file.read()

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 ca55929eda..4bae6968a9 100644
--- 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):
 

         try:

             file = open(path, 'rb')

-        except (IOError, OSError), msg:

+        except (IOError, OSError) as msg:

             return None

 

         t = file.read()

diff --git a/BaseTools/Scripts/UpdateBuildVersions.py b/BaseTools/Scripts/UpdateBuildVersions.py
index e62030aa9f..fb61b89bfb 100755
--- a/BaseTools/Scripts/UpdateBuildVersions.py
+++ b/BaseTools/Scripts/UpdateBuildVersions.py
@@ -90,7 +90,8 @@ def ShellCommandResults(CmdLine, Opt):
             sys.stderr.flush()

         returnValue = err_val.returncode

 

-    except IOError as (errno, strerror):

+    except IOError as err_val:

+        (errno, strerror) = err_val.args

         file_list.close()

         if not Opt.silent:

             sys.stderr.write("I/O ERROR : %s : %s\n" % (str(errno), strerror))

@@ -100,7 +101,8 @@ def ShellCommandResults(CmdLine, Opt):
             sys.stderr.flush()

         returnValue = errno

 

-    except OSError as (errno, strerror):

+    except OSError as err_val:

+        (errno, strerror) = err_val.args

         file_list.close()

         if not Opt.silent:

             sys.stderr.write("OS ERROR : %s : %s\n" % (str(errno), strerror))

@@ -210,13 +212,15 @@ def RevertCmd(Filename, Opt):
             sys.stderr.write("Subprocess ERROR : %s\n" % err_val)

             sys.stderr.flush()

 

-    except IOError as (errno, strerror):

+    except IOError as err_val:

+        (errno, strerror) = err_val.args

         if not Opt.silent:

             sys.stderr.write("I/O ERROR : %d : %s\n" % (str(errno), strerror))

             sys.stderr.write("ERROR : this command failed : %s\n" % CmdLine)

             sys.stderr.flush()

 

-    except OSError as (errno, strerror):

+    except OSError as err_val:

+        (errno, strerror) = err_val.args

         if not Opt.silent:

             sys.stderr.write("OS ERROR : %d : %s\n" % (str(errno), strerror))

             sys.stderr.write("ERROR : this command failed : %s\n" % CmdLine)