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>

1 files changed, 8 insertions, 4 deletions

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)