BaseTools: Refactor python except statements

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Core / PackageFile.py

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