BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Scripts / UpdateBuildVersions.py

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